diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 838d4f3856..328923d342 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -58,6 +58,16 @@ jobs: branch: buildjre17-21 name: jre21-pojav + - name: Get JRE25 + uses: dawidd6/action-download-artifact@v9 + with: + workflow: build.yml + path: app_pojavlauncher/src/main/assets/components/jre-25 + workflow_conclusion: completed + repo: FCL-Team/Android-OpenJDK-Build + branch: Build_JRE_25 + name: jre25-multiarch + - uses: gradle/actions/setup-gradle@v4 with: validate-wrappers: false @@ -83,17 +93,9 @@ jobs: gradle :app_pojavlauncher:assembleDebug mv app_pojavlauncher/build/outputs/apk/debug/app_pojavlauncher-debug.apk out/app-debug.apk - - name: Build APK without runtime - run: | - rm -r app_pojavlauncher/src/main/assets/components/jre - rm -r app_pojavlauncher/src/main/assets/components/jre-new - rm -r app_pojavlauncher/src/main/assets/components/jre-21 - gradle assembleDebug - mv app_pojavlauncher/build/outputs/apk/debug/app_pojavlauncher-debug.apk out/app-debug-noruntime.apk - name: Gen md5sums run: | md5sum out/app-debug.apk > out/app-debug.md5 - md5sum out/app-debug-noruntime.apk > out/app-debug-noruntime.md5 - name: Upload APK uses: actions/upload-artifact@v4 @@ -117,10 +119,3 @@ jobs: releaseFiles: out/app-gplay.aab track: internal inAppUpdatePriority: 5 - - - name: Upload APK (without runtime) - uses: actions/upload-artifact@v4 - with: - name: app-debug-noruntime - path: out/app-debug-noruntime.* - diff --git a/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar b/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar index a14378453a..031be56f05 100644 Binary files a/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar and b/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar b/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar index 715654c533..aba9cba671 100644 Binary files a/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar and b/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/caciocavallo17/version b/app_pojavlauncher/src/main/assets/components/caciocavallo17/version index a026ac09d3..b84a1760cd 100644 --- a/app_pojavlauncher/src/main/assets/components/caciocavallo17/version +++ b/app_pojavlauncher/src/main/assets/components/caciocavallo17/version @@ -1 +1 @@ -20251214-added-javaagent-preloader +20260119-java25-support diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java index 3b7f7c7580..4384011f83 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/NewJREUtil.java @@ -143,7 +143,8 @@ private static void showRuntimeFail(Activity activity, JMinecraftVersionList.Ver private enum InternalRuntime { JRE_17(17, "Internal-17", "components/jre-new"), - JRE_21(21, "Internal-21", "components/jre-21"); + JRE_21(21, "Internal-21", "components/jre-21"), + JRE_25(25, "Internal-25", "components/jre-25"); public final int majorVersion; public final String name; public final String path;