Attempt to fix build issue

Author: shai-almog

maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/IPhoneBuilder.java

@@ -1193,8 +1193,9 @@ public void usesClassMethod(String cls, String method) {
         if (!new File(javacPath).exists()) {
             javacPath = "javac";
         }
+        String[] stubSourceTarget = getStubCompileSourceTarget(javacPath);
         try {
-            if (!execWithFiles(stubSource, stubSource, ".java", javacPath, "-source", "1.6", "-target", "1.6", "-classpath",
+            if (!execWithFiles(stubSource, stubSource, ".java", javacPath, "-source", stubSourceTarget[0], "-target", stubSourceTarget[1], "-classpath",
                     classesDir.getAbsolutePath(),
                     "-d", classesDir.getAbsolutePath())) {
                 return false;
@@ -2595,7 +2596,7 @@ public boolean accept(File file, String string) {
      */
     private int getXcodeVersion(String xcodeBuild) {
         try {
-            String result = execString(tmpFile, xcodeBuild, "-version");
+            String result = execString(new File("."), xcodeBuild, "-version");
             debug("Result is "+result);
 
             Scanner scanner = new Scanner(result);
@@ -2637,7 +2638,37 @@ private int getMajorVersionInt(String versionStr, int defaultVal) {
         return defaultVal;
     }
 
+    private String[] getStubCompileSourceTarget(String javacPath) {
+        String source = "1.6";
+        String target = "1.6";
+        try {
+            String versionOutput = execString(tmpFile != null ? tmpFile : new File("."), javacPath, "-version");
+            if (versionOutput != null && versionOutput.trim().length() > 0) {
+                String[] parts = versionOutput.trim().split("\\s+");
+                String version = parts[parts.length - 1];
+                int major = getMajorVersionInt(version, -1);
+                if (major >= 9) {
+                    source = "8";
+                    target = "8";
+                    log("JDK " + version + " does not support -source/-target 1.6. Compiling iOS stubs with -source/-target 8.");
+                }
+            }
+        } catch (Exception ex) {
+            debug("Failed to resolve javac version for iOS stub compile: " + ex.getMessage());
+        }
+        return new String[]{source, target};
+    }
+
     private String resolveXcodebuild() {
+        String explicitXcodebuild = System.getenv("XCODEBUILD");
+        if (explicitXcodebuild != null && explicitXcodebuild.length() > 0) {
+            File candidate = new File(explicitXcodebuild);
+            if (candidate.exists()) {
+                log("Using xcodebuild from XCODEBUILD: " + candidate.getAbsolutePath());
+                return candidate.getAbsolutePath();
+            }
+        }
+
         String developerDir = System.getenv("DEVELOPER_DIR");
         if (developerDir != null && developerDir.length() > 0) {
             File candidate = new File(developerDir, "usr/bin/xcodebuild");

maven/codenameone-maven-plugin/src/main/java/com/codename1/maven/CN1BuildMojo.java

@@ -1016,6 +1016,10 @@ private void doIOSLocalBuild(File tmpProjectDir, Properties props, File distJar)
         try {
             boolean result = e.build(distJar, request);
             if (!result) {
+                String builderLog = e.getErrorMessage();
+                if (builderLog != null && builderLog.trim().length() > 0) {
+                    getLog().error("iOS builder log:\n" + builderLog);
+                }
                 throw new MojoExecutionException("iOS build failed");
             }
 
@@ -1039,6 +1043,10 @@ private void doIOSLocalBuild(File tmpProjectDir, Properties props, File distJar)
 
 
         } catch (BuildException ex) {
+            String builderLog = e.getErrorMessage();
+            if (builderLog != null && builderLog.trim().length() > 0) {
+                getLog().error("iOS builder log:\n" + builderLog);
+            }
             throw new MojoExecutionException("Failed to build ios app", ex);
         } finally {
 

scripts/build-ios-app.sh

@@ -4,14 +4,19 @@ set -euo pipefail
 
 bia_log() { echo "[build-ios-app] $1"; }
 
-# Pin Xcode so CN1’s Java subprocess sees xcodebuild
-XCODE_APP="${XCODE_APP:-/Applications/Xcode_26.0.1.app}"
-if [ ! -d "$XCODE_APP" ]; then
-  bia_log "Xcode 26 not found at $XCODE_APP. Set XCODE_APP to the Xcode 26 app bundle path." >&2
+# Pin Xcode 26 for CI validation.
+if [ -z "${XCODE_APP:-}" ]; then
+  XCODE_APP="$(ls -d /Applications/Xcode_26*.app 2>/dev/null | sort -V | tail -n 1 || true)"
+fi
+if [ ! -x "$XCODE_APP/Contents/Developer/usr/bin/xcodebuild" ]; then
+  bia_log "Xcode 26 not found. Set XCODE_APP to an installed Xcode 26 app bundle path." >&2
   exit 1
 fi
 export DEVELOPER_DIR="$XCODE_APP/Contents/Developer"
+export XCODEBUILD="$DEVELOPER_DIR/usr/bin/xcodebuild"
 export PATH="$DEVELOPER_DIR/usr/bin:$PATH"
+bia_log "Using DEVELOPER_DIR=$DEVELOPER_DIR"
+bia_log "Using XCODEBUILD=$XCODEBUILD"
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
@@ -56,12 +61,13 @@ fi
 
 ORIGINAL_JAVA_HOME="$JAVA_HOME"
 export PATH="$JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH"
+BASE_PATH="$PATH"
 
 bia_log "Using JAVA_HOME at $JAVA_HOME"
 bia_log "Using JAVA17_HOME at $JAVA17_HOME"
 bia_log "Using Maven installation at $MAVEN_HOME"
 bia_log "Using CocoaPods version $(pod --version 2>/dev/null || echo '<unknown>')"
-bia_log "Java version for Maven process:"
+bia_log "Java version for baseline toolchain:"
 "$JAVA_HOME/bin/java" -version
 bia_log "Using JAVAC from JAVA17_HOME for demo compilation:"
 "$JAVA17_HOME/bin/javac" -version
@@ -81,15 +87,34 @@ mkdir -p "$ARTIFACTS_DIR"
 
 export CN1_BUILD_STATS_FILE="$ARTIFACTS_DIR/iphone-builder-stats.txt"
 
-./mvnw package \
-  -DskipTests \
-  -Dcodename1.platform=ios \
-  -Dcodename1.buildTarget=ios-source \
-  -Dmaven.compiler.fork=true \
-  -Dmaven.compiler.executable="$JAVA17_HOME/bin/javac" \
-  -Dcodename1.arg.ios.uiscene="${IOS_UISCENE}" \
-  -Dopen=false \
-  -U -e
+bia_log "Running HelloCodenameOne Maven build with JAVA_HOME=$JAVA17_HOME"
+(
+  export JAVA_HOME="$JAVA17_HOME"
+  export PATH="$JAVA_HOME/bin:$MAVEN_HOME/bin:$BASE_PATH"
+  MVN_IOS_LOG="$ARTIFACTS_DIR/hellocn1-ios-build.log"
+  set +e
+  ./mvnw package \
+    -DskipTests \
+    -Dcodename1.platform=ios \
+    -Dcodename1.buildTarget=ios-source \
+    -Dmaven.compiler.fork=true \
+    -Dmaven.compiler.executable="$JAVA17_HOME/bin/javac" \
+    -Dcodename1.arg.ios.uiscene="${IOS_UISCENE}" \
+    -Dopen=false \
+    -U -e -X > "$MVN_IOS_LOG" 2>&1
+  RC=$?
+  set -e
+  if [ $RC -ne 0 ]; then
+    bia_log "Maven iOS build failed (exit=$RC). Log: $MVN_IOS_LOG"
+    bia_log "Key failure lines:"
+    if command -v rg >/dev/null 2>&1; then
+      rg -n "(iOS builder log:|Caused by:|BuildException|Cannot run program|UnsupportedClassVersionError|error:|\\[ERROR\\])" "$MVN_IOS_LOG" | tail -n 200 || true
+    else
+      grep -nE "(iOS builder log:|Caused by:|BuildException|Cannot run program|UnsupportedClassVersionError|error:|\\[ERROR\\])" "$MVN_IOS_LOG" | tail -n 200 || true
+    fi
+    exit $RC
+  fi
+)
 VM_END=$(date +%s)
 VM_TIME=$((VM_END - VM_START))
 cd ../..

scripts/run-ios-ui-tests.sh

@@ -53,14 +53,19 @@ ri_log "Loading workspace environment from $ENV_FILE"
 # shellcheck disable=SC1090
 source "$ENV_FILE"
 
-# Use the same Xcode as the build step
-XCODE_APP="${XCODE_APP:-/Applications/Xcode_26.0.1.app}"
-if [ ! -d "$XCODE_APP" ]; then
-  ri_log "Xcode 26 not found at $XCODE_APP. Set XCODE_APP to the Xcode 26 app bundle path." >&2
+# Pin Xcode 26 for CI validation.
+if [ -z "${XCODE_APP:-}" ]; then
+  XCODE_APP="$(ls -d /Applications/Xcode_26*.app 2>/dev/null | sort -V | tail -n 1 || true)"
+fi
+if [ ! -x "$XCODE_APP/Contents/Developer/usr/bin/xcodebuild" ]; then
+  ri_log "Xcode 26 not found. Set XCODE_APP to an installed Xcode 26 app bundle path." >&2
   exit 3
 fi
 export DEVELOPER_DIR="$XCODE_APP/Contents/Developer"
+export XCODEBUILD="$DEVELOPER_DIR/usr/bin/xcodebuild"
 export PATH="$DEVELOPER_DIR/usr/bin:$PATH"
+ri_log "Using DEVELOPER_DIR=$DEVELOPER_DIR"
+ri_log "Using XCODEBUILD=$XCODEBUILD"
 
 if [ -z "${JAVA17_HOME:-}" ] || [ ! -x "$JAVA17_HOME/bin/java" ]; then
   ri_log "JAVA17_HOME not set correctly" >&2