From b190ffb6b3c8e46435a63c3bfbdcf7814cb2236d Mon Sep 17 00:00:00 2001 From: Atrate Date: Wed, 1 Jul 2020 15:33:24 +0200 Subject: [PATCH 01/10] Make app movable to SD card (#67) --- android/AndroidManifest.xml | 3 ++- android/build.gradle | 4 ++-- build.gradle | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 0579bc9..c4fdc3c 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,6 +1,7 @@ + package="dev.lonami.klooni" + android:installLocation="auto"> Date: Sun, 30 Aug 2020 11:54:39 +0200 Subject: [PATCH 02/10] Avoid using FitViewport in Android Fixes #66. --- core/src/dev/lonami/klooni/screens/MainMenuScreen.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/dev/lonami/klooni/screens/MainMenuScreen.java b/core/src/dev/lonami/klooni/screens/MainMenuScreen.java index 6b8fa10..cac16fb 100644 --- a/core/src/dev/lonami/klooni/screens/MainMenuScreen.java +++ b/core/src/dev/lonami/klooni/screens/MainMenuScreen.java @@ -26,7 +26,6 @@ import com.badlogic.gdx.scenes.scene2d.InputListener; import com.badlogic.gdx.scenes.scene2d.Stage; import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; -import com.badlogic.gdx.utils.viewport.FitViewport; import dev.lonami.klooni.Klooni; import dev.lonami.klooni.actors.SoftButton; @@ -58,7 +57,6 @@ public class MainMenuScreen extends InputListener implements Screen { Table table = new Table(); table.setFillParent(true); stage.addActor(table); - stage.setViewport(new FitViewport(Klooni.GAME_WIDTH, Klooni.GAME_HEIGHT)); // Play button final SoftButton playButton = new SoftButton( From 7bc26d9a62e178f093d2ab2504d63a0307f86f7f Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sun, 30 Aug 2020 12:00:48 +0200 Subject: [PATCH 03/10] Make method static if possible Closes #61. --- core/src/dev/lonami/klooni/screens/GameScreen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/dev/lonami/klooni/screens/GameScreen.java b/core/src/dev/lonami/klooni/screens/GameScreen.java index cb05f98..ddc0b8d 100644 --- a/core/src/dev/lonami/klooni/screens/GameScreen.java +++ b/core/src/dev/lonami/klooni/screens/GameScreen.java @@ -323,7 +323,7 @@ class GameScreen implements Screen, InputProcessor, BinSerializable { } } - private void deleteSave() { + private static void deleteSave() { final FileHandle handle = Gdx.files.local(SAVE_DAT_FILENAME); if (handle.exists()) handle.delete(); From 5d88d63419e65b97bece652fbaa514747e7cc332 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sun, 30 Aug 2020 12:17:55 +0200 Subject: [PATCH 04/10] Add a hack to allow sharing files on newer android versions Maybe fixes #46. It might not since it had no traceback. --- .../src/dev/lonami/klooni/AndroidLauncher.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/android/src/dev/lonami/klooni/AndroidLauncher.java b/android/src/dev/lonami/klooni/AndroidLauncher.java index 319fa58..20ff821 100644 --- a/android/src/dev/lonami/klooni/AndroidLauncher.java +++ b/android/src/dev/lonami/klooni/AndroidLauncher.java @@ -17,15 +17,31 @@ */ package dev.lonami.klooni; +import android.os.Build; import android.os.Bundle; +import android.os.StrictMode; import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; +import java.lang.reflect.Method; + public class AndroidLauncher extends AndroidApplication { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + // FIXME: Hack to allow us use the old way to share files + // https://stackoverflow.com/a/42437379/ + if (Build.VERSION.SDK_INT >= 24) { + try { + Method m = StrictMode.class.getMethod("disableDeathOnFileUriExposure"); + m.invoke(null); + } catch (Exception e) { + e.printStackTrace(); + } + } + final AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); final AndroidShareChallenge shareChallenge = new AndroidShareChallenge(this); initialize(new Klooni(shareChallenge), config); From 21358abff92b4693fb9a530b8d99ce348740e4f7 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sun, 30 Aug 2020 12:19:36 +0200 Subject: [PATCH 05/10] Bump to v0.8.6 --- android/build.gradle | 4 ++-- build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b9468fe..0914ab2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { //noinspection MinSdkTooLow minSdkVersion 8 targetSdkVersion 29 - versionCode 850 - versionName "0.8.5" + versionCode 860 + versionName "0.8.6" } buildTypes { release { diff --git a/build.gradle b/build.gradle index 692af87..ce12746 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { allprojects { apply plugin: "eclipse" - version = '0.8.5' + version = '0.8.6' ext { appName = "1010! Klooni" gdxVersion = '1.9.10' From 68471bc30faa5e266b929bf45ef8c57f0adc2185 Mon Sep 17 00:00:00 2001 From: Lonami Date: Fri, 30 Oct 2020 09:55:57 +0100 Subject: [PATCH 06/10] Add workflow to automatically release artifacts Should help with #74. --- .github/workflows/desktop-release.yml | 45 +++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/desktop-release.yml diff --git a/.github/workflows/desktop-release.yml b/.github/workflows/desktop-release.yml new file mode 100644 index 0000000..a5647d7 --- /dev/null +++ b/.github/workflows/desktop-release.yml @@ -0,0 +1,45 @@ +name: Automatic Desktop Release + +on: + push: + tags: + - 'v*' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew desktop:dist + + - name: Create release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: ${{ github.ref }} + draft: false + prerelease: false + + - name: Upload release asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./desktop/build/libs/*.jar + asset_name: Klooni-${{ github.ref }}.jar + asset_content_type: application/java-archive From 8fabbfef8cfe907236ee50cc9eba59e5d36f4af4 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Fri, 30 Oct 2020 10:54:21 +0100 Subject: [PATCH 07/10] Fix publish workflow and update README Closes #74. --- .github/workflows/desktop-release.yml | 12 ++++++++++-- README.md | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/desktop-release.yml b/.github/workflows/desktop-release.yml index a5647d7..c469b0f 100644 --- a/.github/workflows/desktop-release.yml +++ b/.github/workflows/desktop-release.yml @@ -23,6 +23,14 @@ jobs: - name: Build with Gradle run: ./gradlew desktop:dist + - name: Define env vars + id: vars + run: | + echo ::set-output name=jar_file::\ + $(echo ./desktop/build/libs/*.jar) + echo ::set-output name=version::\ + $(echo ./desktop/build/libs/*.jar | grep -Po -- '(?<=-)(.+?)(?=\.jar)') + - name: Create release id: create_release uses: actions/create-release@v1 @@ -40,6 +48,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./desktop/build/libs/*.jar - asset_name: Klooni-${{ github.ref }}.jar + asset_path: ${{ steps.vars.outputs.jar_file }} + asset_name: Klooni-${{ steps.vars.outputs.version }}.jar asset_content_type: application/java-archive diff --git a/README.md b/README.md index daddfa8..70861c9 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ Play 1010! for free! Add your own themes! Contribute! Make the game yours! [Get it on F-Droid](https://f-droid.org/app/dev.lonami.klooni) +(Desktop builds are available on the [releases page](https://github.com/LonamiWebs/Klooni1010/releases).) + This project is licensed under [GPLv3+](LICENSE). **Table of contents**: From 832e8d27aa696e8c62424e68e0766a4d95cfb8e4 Mon Sep 17 00:00:00 2001 From: Ivan Tham Date: Fri, 30 Oct 2020 18:09:07 +0800 Subject: [PATCH 08/10] Use sed to get package version (#75) The sed tool is more fitting than grep in this case. --- .github/workflows/desktop-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/desktop-release.yml b/.github/workflows/desktop-release.yml index c469b0f..b6c6840 100644 --- a/.github/workflows/desktop-release.yml +++ b/.github/workflows/desktop-release.yml @@ -29,7 +29,7 @@ jobs: echo ::set-output name=jar_file::\ $(echo ./desktop/build/libs/*.jar) echo ::set-output name=version::\ - $(echo ./desktop/build/libs/*.jar | grep -Po -- '(?<=-)(.+?)(?=\.jar)') + $(echo ./desktop/build/libs/*.jar | sed 's/.*-\([0-9.]\+\)\.jar/\1/') - name: Create release id: create_release From 13cd4877ea9cb6a554823b49b03d230b921d561b Mon Sep 17 00:00:00 2001 From: yashpalgoyal1304 Date: Sat, 5 Jun 2021 12:15:04 +0530 Subject: [PATCH 09/10] Rename screenshots to have more predictable names (#79) Removed suffixes --- .../images/phoneScreenshots/{1-game.jpg => 1.jpg} | Bin .../images/phoneScreenshots/{2-pause.jpg => 2.jpg} | Bin .../images/phoneScreenshots/{3-themes.jpg => 3.jpg} | Bin 3 files changed, 0 insertions(+), 0 deletions(-) rename fastlane/metadata/android/en-US/images/phoneScreenshots/{1-game.jpg => 1.jpg} (100%) rename fastlane/metadata/android/en-US/images/phoneScreenshots/{2-pause.jpg => 2.jpg} (100%) rename fastlane/metadata/android/en-US/images/phoneScreenshots/{3-themes.jpg => 3.jpg} (100%) diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1-game.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg similarity index 100% rename from fastlane/metadata/android/en-US/images/phoneScreenshots/1-game.jpg rename to fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2-pause.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg similarity index 100% rename from fastlane/metadata/android/en-US/images/phoneScreenshots/2-pause.jpg rename to fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3-themes.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg similarity index 100% rename from fastlane/metadata/android/en-US/images/phoneScreenshots/3-themes.jpg rename to fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg From ec0b9ddfb59bd616f39920ab887b5e2d5dfd3427 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Thu, 22 Sep 2022 08:18:37 +0000 Subject: [PATCH 10/10] Remove space in title metadata (#80) --- fastlane/metadata/android/en-US/title.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt index eea6abd..6024fb8 100644 --- a/fastlane/metadata/android/en-US/title.txt +++ b/fastlane/metadata/android/en-US/title.txt @@ -1 +1 @@ - 1010! Klooni +1010! Klooni