diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b70153..4c81c6b 100644 --- a/.github/workflows/ci.yml +++ b/.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: diff --git a/.github/workflows/deploy_itch.yml b/.github/workflows/deploy_itch.yml new file mode 100644 index 0000000..8d5dcda --- /dev/null +++ b/.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/itch-publish@v0.0.3 + 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 diff --git a/.github/workflows/deploy_pages.yml b/.github/workflows/deploy_pages.yml new file mode 100644 index 0000000..ca19de8 --- /dev/null +++ b/.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 diff --git a/.gitignore b/.gitignore index bd28459..c4c6ca1 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ www-test/ *.iml /android/out/ com_crashlytics_export_strings.xml +/android/release ## Eclipse diff --git a/README.md b/README.md index 59a57d0..a3f970e 100644 --- a/README.md +++ b/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. - + Get it on F-Droid - + Get it on Google Play diff --git a/android/build.gradle b/android/build.gradle index 589a1e2..3328491 100644 --- a/android/build.gradle +++ b/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 { diff --git a/build.gradle b/build.gradle index 2ce7ff2..14f345f 100644 --- a/build.gradle +++ b/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' } diff --git a/fastlane/metadata/android/en-US/changelogs/6.txt b/fastlane/metadata/android/en-US/changelogs/6.txt index 4c32c01..9f3f6af 100644 --- a/fastlane/metadata/android/en-US/changelogs/6.txt +++ b/fastlane/metadata/android/en-US/changelogs/6.txt @@ -1,2 +1,5 @@ -- Translation updates -- Under the hood improvements \ No newline at end of file +- Use I18NBundle for strings (#30) +- Regenerate the project for libGDX 1.11.0 (#36) +- Dependency updates +- Removed unused parts +- Many other improvements diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/fastlane/metadata/android/en-US/changelogs/7.txt new file mode 100644 index 0000000..cce9a03 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/7.txt @@ -0,0 +1 @@ +- Dependency updates