From 46d8b2f0107cee2eb8804de7bdbd108f67efcfe2 Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 01:41:06 +0800 Subject: [PATCH 01/16] Create android.yml --- .github/workflows/android.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/android.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 000000000..130bbb8fd --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,31 @@ +name: Android CI + +on: + push: + branches: [ "margarita" ] + pull_request: + branches: [ "margarita" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v4 + with: + java-version: '20' + distribution: 'temurin' + cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew assembleDebug #build + - uses: actions/upload-artifact@v4 + with: + name: my-artifact + path: '**/*.apk' + From d46674467569a62332a8011fa064ad887acb5b03 Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 01:42:44 +0800 Subject: [PATCH 02/16] Update android.yml --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 130bbb8fd..834a7be22 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: set up JDK 11 + - name: set up JDK uses: actions/setup-java@v4 with: - java-version: '20' + java-version: '21' distribution: 'temurin' cache: gradle From bbf2eb9d96e6bf385ea96042851624f327df305e Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 01:45:06 +0800 Subject: [PATCH 03/16] Update build.gradle --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 6ff0b1e6d..01c726c6d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -37,9 +37,9 @@ android { //This makes release APKs smaller and more efficient, but also makes debugging trickier //as the information produced in stack traces must be de-obfuscated. //See here: https://developer.android.com/studio/build/shrink-code#decode-stack-trace - shrinkResources true - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + // shrinkResources true + // minifyEnabled true + // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' dependencies { releaseImplementation project(':services:updates:githubUpdates') From d3b430f238f662e0d3b47960a229964fd643f52d Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 01:46:17 +0800 Subject: [PATCH 04/16] Update android.yml --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 834a7be22..bcadd1262 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -16,7 +16,7 @@ jobs: - name: set up JDK uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '20' distribution: 'temurin' cache: gradle From a79a2de278af424cd0ef7010c08f19dd046ff697 Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 01:49:12 +0800 Subject: [PATCH 05/16] Update android.yml --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index bcadd1262..ac6d2ddb4 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -16,7 +16,7 @@ jobs: - name: set up JDK uses: actions/setup-java@v4 with: - java-version: '20' + java-version: '19' distribution: 'temurin' cache: gradle From ad2ce1c1a1d6dd27c8f529b21962f1202e417f86 Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 02:09:19 +0800 Subject: [PATCH 06/16] Update android.yml --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ac6d2ddb4..bcadd1262 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -16,7 +16,7 @@ jobs: - name: set up JDK uses: actions/setup-java@v4 with: - java-version: '19' + java-version: '20' distribution: 'temurin' cache: gradle From 20c222f9a084c099d50dfb23584ea83767c39b8b Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 02:11:19 +0800 Subject: [PATCH 07/16] Update build.gradle --- build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2fed26707..a913fccc5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' + } } @@ -22,6 +23,7 @@ allprojects { appAndroidCompileSDK = 33 appAndroidMinSDK = 19 appAndroidTargetSDK = 33 + multiDexEnabled true gdxVersion = '1.11.0' gdxControllersVersion = '2.2.4-SNAPSHOT' @@ -35,4 +37,7 @@ allprojects { maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } -} \ No newline at end of file +} +dependencies { + implementation "androidx.multidex:multidex:2.0.1" +} From 2a1545531141e02f342ad6033f2085957f069f58 Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 02:11:35 +0800 Subject: [PATCH 08/16] Update android.yml --- .github/workflows/android.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index bcadd1262..b6ba1c48c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -6,6 +6,7 @@ on: pull_request: branches: [ "margarita" ] + jobs: build: From 1d9e3ae2627acea69dcfd766f572b728edb972f1 Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 02:12:58 +0800 Subject: [PATCH 09/16] Update android.yml --- .github/workflows/android.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index b6ba1c48c..b26b57062 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -7,6 +7,7 @@ on: branches: [ "margarita" ] + jobs: build: From 850fab5736bf0bb3415c4091c917389f1cdc6bd5 Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 02:18:30 +0800 Subject: [PATCH 10/16] Update AndroidManifest.xml --- android/src/main/AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index f08afa88e..a37e72bed 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -29,7 +29,8 @@ android:resizeableActivity="true" android:allowBackup="true" android:fullBackupOnly="true" - android:backupAgent=".AndroidBackupHandler"> + android:backupAgent=".AndroidBackupHandler" + android:name="androidx.multidex.MultiDexApplication" > Date: Sat, 10 Aug 2024 02:24:16 +0800 Subject: [PATCH 11/16] Update build.gradle --- android/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index 01c726c6d..4099dfc50 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -14,6 +14,7 @@ android { versionCode appVersionCode versionName appVersionName + //noinspection MinSdkTooLow minSdkVersion appAndroidMinSDK @@ -125,3 +126,7 @@ task copyAndroidNatives() { // jvmTarget = "1.8" // } //} +dependencies { + def multidex_version = "2.0.1" + implementation "androidx.multidex:multidex:$multidex_version" +} From 47334edcffe4ce56a4240744f69560db7cefe059 Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 02:26:43 +0800 Subject: [PATCH 12/16] Update build.gradle --- android/build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 4099dfc50..b7ff4f649 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -19,6 +19,7 @@ android { //noinspection MinSdkTooLow minSdkVersion appAndroidMinSDK targetSdkVersion appAndroidTargetSDK + multiDexEnabled true resourceConfigurations += ['en_US', 'cs', 'de', 'el', 'es', 'fr', 'hu', 'in', 'it', 'ja', 'ko', 'nl', 'pl', 'pt', 'ru', 'tr', 'uk', 'vi', 'zh_CN'] } @@ -55,7 +56,9 @@ android { } } } - +dependencies { + implementation "androidx.multidex:multidex:2.0.1" +} configurations { natives } dependencies { From bc2d91605fb6dd68e6e6d696e493f9336af4a65e Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 02:28:24 +0800 Subject: [PATCH 13/16] Update build.gradle --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index a913fccc5..e953b4e44 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ allprojects { appAndroidCompileSDK = 33 appAndroidMinSDK = 19 appAndroidTargetSDK = 33 - multiDexEnabled true + gdxVersion = '1.11.0' gdxControllersVersion = '2.2.4-SNAPSHOT' @@ -38,6 +38,6 @@ allprojects { } } -dependencies { +/*dependencies { implementation "androidx.multidex:multidex:2.0.1" -} +}*/ From ef0063b3a81cd2ea2366a3d4f420c25452fbc023 Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Sat, 10 Aug 2024 02:31:35 +0800 Subject: [PATCH 14/16] Update gradle.properties --- gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 29b68ab81..84c73f903 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,4 +12,5 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemor org.gradle.parallel=true # Necessary to turn off certain R8 optimizations that would otherwise cause Shattered to crash -android.enableR8.fullMode=false \ No newline at end of file +android.enableR8.fullMode=false +android.useAndroidX=true From 374dd7ed5fe277c3547bbda07d3935eb897e9d15 Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Mon, 19 Aug 2024 13:57:39 +0800 Subject: [PATCH 15/16] Update android.yml --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index b26b57062..9622311df 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -18,7 +18,7 @@ jobs: - name: set up JDK uses: actions/setup-java@v4 with: - java-version: '20' + java-version: '22.0.2+9' distribution: 'temurin' cache: gradle From 7591ac36d570bfdcf1eeee2201e579dd14ebb3e1 Mon Sep 17 00:00:00 2001 From: zay448345045 Date: Mon, 19 Aug 2024 13:58:21 +0800 Subject: [PATCH 16/16] Update android.yml --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9622311df..d3b32f346 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -18,7 +18,7 @@ jobs: - name: set up JDK uses: actions/setup-java@v4 with: - java-version: '22.0.2+9' + java-version: '21' distribution: 'temurin' cache: gradle