remove java 17 support

as java 17+21 is broken
SolDev69 · Apr 16, 2024 · 1bd2b80 · 1bd2b80
1 parent b22193d
commit 1bd2b80
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 111 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -36,16 +36,6 @@ jobs:
           branch: buildjre8
           name: jre8-pojav
 
-      - name: Get JRE17
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          workflow: build.yml
-          path: app_pojavlauncher/src/main/assets/components/jre-new
-          workflow_conclusion: success
-          repo: PojavLauncherTeam/android-openjdk-build-multiarch
-          branch: buildjre17
-          name: jre17-pojav
-
       - name: Get JRE21
         uses: dawidd6/action-download-artifact@v2
         with:

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JRE17Util.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JRE17Util.java
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java
@@ -13,7 +13,6 @@
 import net.kdt.pojavlaunch.JAssetInfo;
 import net.kdt.pojavlaunch.JAssets;
 import net.kdt.pojavlaunch.JMinecraftVersionList;
-import net.kdt.pojavlaunch.JRE17Util;
 import net.kdt.pojavlaunch.JRE21Util;
 import net.kdt.pojavlaunch.R;
 import net.kdt.pojavlaunch.Tools;
@@ -191,7 +190,7 @@ private MinecraftClientInfo getClientInfo(JMinecraftVersionList.Version verInfo)
      * @param activity Activity, used for automatic installation of JRE 17 if needed
      * @param verInfo The JMinecraftVersionList.Version from the version list, if available
      * @param versionName The version ID (necessary)
-     * @return false if JRE17 installation failed, true otherwise
+     * @return false if JRE21 installation failed, true otherwise
      * @throws IOException if the download of any of the metadata files fails
      */
     private boolean downloadAndProcessMetadata(Activity activity, JMinecraftVersionList.Version verInfo, String versionName) throws IOException, MirrorTamperedException {
@@ -204,7 +203,7 @@ private boolean downloadAndProcessMetadata(Activity activity, JMinecraftVersionL
             throw new IOException("Unable to read Version JSON for version " + versionName);
         }
 
-        if(activity != null && !JRE17Util.installNewJreIfNeeded(activity, verInfo) && !JRE21Util.installNewJreIfNeeded(activity, verInfo)){
+        if(activity != null && !JRE21Util.installNewJreIfNeeded(activity, verInfo)){
             return false;
         }