Merge pull request #46 from Crazy-Marvin/development

Halma 7.0

.github/workflows/ci.yml

@@ -5,9 +5,9 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ master ]
+    branches: [ trunk ]
   pull_request:
-    branches: [ master ]
+    branches: [ trunk ]
 
 jobs:
   build:

.github/workflows/deploy_itch.yml

@@ -0,0 +1,19 @@
+- name: Publish Halma on Itch.io
+  # You may pin to the exact commit or the version.
+  # uses: KikimoraGames/itch-publish@ea06fdc7e36b34a6c4f88b379a73f3362537b998
+  uses: KikimoraGames/[email protected]
+  with:
+    # Butler API Key
+    butlerApiKey: 
+    # Directory or .zip file of the game data. Zip files are slower to upload.
+    gameData: 
+    # Itch.io username of the game owner. e.g. in finji/overland this would be finji.
+    itchUsername: 
+    # Itch.io id of the game. e.g. in finji/overland this would be overland.
+    itchGameId: 
+    # Channel name of the game: https://itch.io/docs/butler/pushing.html#channel-names
+    buildChannel: 
+    # Optional build number, use to supply your own build version instead of using itch's versioning
+    buildNumber: # optional
+    # Optional build number file path, use to supply your own build version instead of using itch's versioning. The file should contain a single line with the version or build number, in UTF-8 without BOM.
+    buildNumberFile: # optional

.github/workflows/deploy_pages.yml

@@ -0,0 +1,42 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy Halma to GitHub Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["trunk"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Pages
+        uses: actions/configure-pages@v2
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+        with:
+          # Upload entire repository
+          path: '.'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

.gitignore

@@ -29,6 +29,7 @@ www-test/
 *.iml
 /android/out/
 com_crashlytics_export_strings.xml
+/android/release
 
 ## Eclipse
 

README.md

@@ -10,19 +10,19 @@
 [![Hosted Weblate](https://hosted.weblate.org/widgets/halma/-/svg-badge.svg)](https://hosted.weblate.org/engage/halma/)
 [![Known Vulnerabilities](https://img.shields.io/snyk/vulnerabilities/github/Crazy-Marvin/Halma)](https://snyk.io/)
 [![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19)
-[![F-Droid](https://img.shields.io/f-droid/v/rocks.poopjournal.halma.svg)](https://f-droid.org/en/packages/rocks.poopjournal.halma/)
-[![Google Play](https://badgen.net/badge/icon/googleplay?icon=googleplay&label)](https://play.google.com/store/apps/details?id=rocks.poopjournal.halma)
+[![F-Droid](https://img.shields.io/f-droid/v/rocks.poopjournal.halma.svg)](https://f-droid.org/en/packages/app.halma/)
+[![Google Play](https://badgen.net/badge/icon/googleplay?icon=googleplay&label)](https://play.google.com/store/apps/details?id=app.halma)
 
 # Halma
 
 This is the Halma game built with the awesome [libGDX](https://libgdx.com/) framework. It is optimized for Android and the web.
 
-<a href="https://f-droid.org/packages/rocks.poopjournal.halma/">
+<a href="https://f-droid.org/packages/app.halma/">
     <img alt="Get it on F-Droid"
         height="80"
         src="https://user-images.githubusercontent.com/15004217/36919296-19b8524e-1e5d-11e8-8962-48463b1cec8a.png" />
         </a>
-<a href="https://play.google.com/store/apps/details?id=rocks.poopjournal.halma">
+<a href="https://play.google.com/store/apps/details?id=app.halma">
     <img alt="Get it on Google Play"
         height="80"
         src="https://user-images.githubusercontent.com/15004217/36810046-fa306856-1cc9-11e8-808e-6eb8a81783c7.png" />

android/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "app.halma"
         minSdkVersion 14
         targetSdkVersion 31
-        versionCode 6
-        versionName "6.0"
+        versionCode 7
+        versionName "7.0"
     }
     buildTypes {
         release {

build.gradle

@@ -8,8 +8,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'org.wisepersist:gwt-gradle-plugin:1.1.19'
-        classpath 'org.gretty:gretty:3.0.7'
+        classpath 'org.wisepersist:gwt-gradle-plugin:1.1.16'
+        classpath 'org.gretty:gretty:3.0.8'
         classpath 'com.android.tools.build:gradle:7.2.2'
 
     }

fastlane/metadata/android/en-US/changelogs/6.txt

@@ -1,2 +1,5 @@
-- Translation updates
-- Under the hood improvements
+- Use I18NBundle for strings (#30)
+- Regenerate the project for libGDX 1.11.0 (#36)
+- Dependency updates
+- Removed unused parts
+- Many other improvements

fastlane/metadata/android/en-US/changelogs/7.txt

@@ -0,0 +1 @@
+- Dependency updates