Merge pull request #218 from raeleus/Fix-iOS-Java-version-validation

Fix iOS Java version validation
libgdx · Jan 19, 2025 · e31fa4c · e31fa4c
2 parents 49e3d2f + a5d8460
commit e31fa4c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/main/java/gdx/liftoff/Main.java b/src/main/java/gdx/liftoff/Main.java
@@ -660,6 +660,10 @@ public static boolean validateUserProjectData() {
             return false;
         }
 
+        if (UserData.platforms.contains("ios") && !"7".equals(UserData.javaVersion) && !"8".equals(UserData.javaVersion)) {
+            return false;
+        }
+
         return true;
     }
 

diff --git a/src/main/java/gdx/liftoff/ui/panels/PathsPanel.java b/src/main/java/gdx/liftoff/ui/panels/PathsPanel.java
@@ -153,6 +153,12 @@ private void updateDeleteProjectPathButton() {
     }
 
     public void updateError() {
+        if (UserData.platforms.contains("ios") && !"7".equals(UserData.javaVersion) && !"8".equals(UserData.javaVersion)) {
+            errorLabel.restart(prop.getProperty("iosWrongJavaVersion"));
+            errorLabel.skipToTheEnd();
+            return;
+        }
+
         if (UserData.projectPath == null || UserData.projectPath.isEmpty()) {
             errorLabel.restart(prop.getProperty("nullDirectory"));
             errorLabel.skipToTheEnd();

diff --git a/src/main/java/gdx/liftoff/ui/panels/SettingsPanel.java b/src/main/java/gdx/liftoff/ui/panels/SettingsPanel.java
@@ -7,6 +7,7 @@
 import com.ray3k.stripe.PopTable;
 import com.ray3k.stripe.PopTable.TableShowHideListener;
 import gdx.liftoff.ui.UserData;
+import gdx.liftoff.ui.dialogs.FullscreenDialog;
 import gdx.liftoff.ui.dialogs.GradleDialog;
 
 import static gdx.liftoff.Main.*;
@@ -40,14 +41,18 @@ public void populate(boolean fullscreen) {
         onChange(libgdxTextField, () -> UserData.libgdxVersion = libgdxTextField.getText());
 
         //java version
-        if(UserData.platforms.contains("ios") && !"7".equals(UserData.javaVersion))
-            UserData.javaVersion = "8";
         TextField javaTextField = addField(prop.getProperty("javaVersion"),
             prop.getProperty("javaVersionTip"), UserData.javaVersion, table);
         onChange(javaTextField, () -> {
-            if(UserData.platforms.contains("ios") && !"7".equals(javaTextField.getText()))
-                javaTextField.setText("8");
             UserData.javaVersion = javaTextField.getText();
+            if (FullscreenDialog.fullscreenDialog != null) {
+                FullscreenDialog.fullscreenDialog.updatePathsError();
+                FullscreenDialog.fullscreenDialog.updateGenerateButtons();
+            }
+            if (root.settingsTable != null) {
+                root.settingsTable.updateError();
+                root.settingsTable.updateGenerateButton();
+            }
         });
 
         //application version

diff --git a/src/main/resources/ui-data/nls.properties b/src/main/resources/ui-data/nls.properties
@@ -749,6 +749,7 @@ notEmpty={SICK=0.35;0.4}{GRADIENT=FIREBRICK;SCARLET;1.1;7.0}%s name cannot be em
 nameNotValid={SICK=0.35;0.4}{GRADIENT=FIREBRICK;SCARLET;1.1;7.0}Project name must contain at least one alphanumeric char, and cannot contain a colon ( : ).{ENDGRADIENT}{ENDSICK}
 classNotValid={SICK=0.35;0.4}{GRADIENT=FIREBRICK;SCARLET;1.1;7.0}Main class name is not a valid Java identifier.{ENDGRADIENT}{ENDSICK}
 packageNotValid={SICK=0.35;0.4}{GRADIENT=FIREBRICK;SCARLET;1.1;7.0}Package name is not a valid Java package, or lacks a dot ( . ).{ENDGRADIENT}{ENDSICK}
+iosWrongJavaVersion={SICK=0.35;0.4}{GRADIENT=FIREBRICK;SCARLET;1.1;7.0}Java version must be 7 or 8 for iOS compatibility.{ENDGRADIENT}{ENDSICK}
 nullDirectory={SICK=0.35;0.4}{GRADIENT=FIREBRICK;SCARLET;1.1;7.0}A project path must be selected.{ENDGRADIENT}{ENDSICK}
 notDirectory={SICK=0.35;0.4}{GRADIENT=FIREBRICK;SCARLET;1.1;7.0}Selected destination is not a directory.{ENDGRADIENT}{ENDSICK}
 sdkNullDirectory={SICK=0.35;0.4}{GRADIENT=FIREBRICK;SCARLET;1.1;7.0}An Android SDK path must be selected for Android projects.{ENDGRADIENT}{ENDSICK}