Improve JDK provisioning and build scripts

Author: shai-almog

BUILDING.md

@@ -1,10 +1,10 @@
 # Building Codename One
 
-This guide explains how to build Codename One and its Android and iOS ports locally using Maven.
+This guide explains how to build Codename One and its Android and iOS ports locally with Maven.
 
 ## Prerequisites
 
-- **JDK 8** (Codename One also builds with JDK 11, but these steps use JDK 8)
+- **JDK 11** (Codename One also builds with JDK 8, but these steps use JDK 11)
 - **JDK 17** for building the Android port
 - **Apache Maven 3.6+**
 - macOS with Xcode (required only for the iOS port)
@@ -16,10 +16,10 @@ The helper scripts in the `scripts/` directory download these dependencies when
 Download binaries from [Adoptium](https://adoptium.net):
 
 ```bash
-# JDK 8 (Linux x64; adjust `_x64_linux_` for your platform)
-curl -L -o temurin8.tar.gz https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u442b06.tar.gz
-tar xf temurin8.tar.gz
-export JAVA_HOME=$PWD/jdk8u442-b06
+# JDK 11 (Linux x64; adjust `_x64_linux_` for your platform)
+curl -L -o temurin11.tar.gz https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jdk_x64_linux_hotspot_11.0.28_6.tar.gz
+tar xf temurin11.tar.gz
+export JAVA_HOME=$PWD/jdk-11.0.28+6
 
 # JDK 17 (Linux x64; adjust `_x64_linux_` for your platform)
 curl -L -o temurin17.tar.gz https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.16_8.tar.gz
@@ -31,7 +31,7 @@ export PATH="$JAVA_HOME/bin:$PATH"
 
 ## Preparing the workspace
 
-Clone the repository and run the setup script to download JDK 8 and JDK 17, install Maven, build the core modules, and install the Maven archetypes. This step must be performed before building any ports.
+Clone the repository and run the setup script to download JDK 11 and JDK 17, install Maven, build the core modules, and install the Maven archetypes. This step must be performed before building any ports.
 
 ```bash
 git clone https://github.com/codenameone/CodenameOne
@@ -44,7 +44,7 @@ The script runs `mvn install` in `maven/`, installs `cn1-maven-archetypes`, and
 
 ## Building the Android port
 
-The Android port uses JDK 17 for compilation while Maven runs with JDK 8. Run the build script:
+The Android port uses JDK 17 for compilation while Maven runs with JDK 11. Run the build script:
 
 ```bash
 ./scripts/build-android-port.sh -DskipTests
@@ -64,9 +64,9 @@ Artifacts are produced in `maven/ios/target`.
 
 ## Convenience scripts
 
-- `setup-workspace.sh` – installs Maven, downloads JDK 8 and JDK 17, builds the core modules, installs Maven archetypes, provisions the Codename One build client, and writes `tools/env.sh`.
-- `build-android-port.sh` – builds the Android port using JDK 8 for Maven and JDK 17 for compilation.
-- `build-ios-port.sh` – builds the iOS port on macOS with JDK 8.
+- `setup-workspace.sh` – installs Maven, downloads JDK 11 and JDK 17, builds the core modules, installs Maven archetypes, provisions the Codename One build client, and writes `tools/env.sh`.
+- `build-android-port.sh` – builds the Android port using JDK 11 for Maven and JDK 17 for compilation.
+- `build-ios-port.sh` – builds the iOS port on macOS with JDK 11.
 
 ## Further reading
 

scripts/build-android-port.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Build Codename One Android port using JDK 8 for Maven and JDK 17 for compilation
+# Build Codename One Android port using JDK 11 for Maven and JDK 17 for compilation
 set -euo pipefail
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 cd "$ROOT"
@@ -11,12 +11,22 @@ else
   source "$ROOT/tools/env.sh"
 fi
 
-if ! "$JAVA_HOME/bin/java" -version 2>&1 | grep -q '1\.8'; then
-  echo "JAVA_HOME must point to JDK 8" >&2
+if ! "$JAVA_HOME/bin/java" -version 2>&1 | grep -q '11\.0'; then
+  echo "JAVA_HOME is not JDK 11; running setup-workspace.sh" >&2
+  ./scripts/setup-workspace.sh -q -DskipTests
+  source "$ROOT/tools/env.sh"
+fi
+if ! "$JAVA_HOME/bin/java" -version 2>&1 | grep -q '11\.0'; then
+  echo "Failed to provision JDK 11" >&2
   exit 1
 fi
 if ! "$JAVA_HOME_17/bin/java" -version 2>&1 | grep -q '17\.0'; then
-  echo "JAVA_HOME_17 must point to JDK 17" >&2
+  echo "JAVA_HOME_17 is not JDK 17; running setup-workspace.sh" >&2
+  ./scripts/setup-workspace.sh -q -DskipTests
+  source "$ROOT/tools/env.sh"
+fi
+if ! "$JAVA_HOME_17/bin/java" -version 2>&1 | grep -q '17\.0'; then
+  echo "Failed to provision JDK 17" >&2
   exit 1
 fi
 

scripts/build-ios-port.sh

@@ -17,8 +17,13 @@ else
   ./scripts/setup-workspace.sh -q -DskipTests
   source "$ROOT/tools/env.sh"
 fi
-if ! "$JAVA_HOME/bin/java" -version 2>&1 | grep -q '1\.8'; then
-  echo "JAVA_HOME must point to JDK 8" >&2
+if ! "$JAVA_HOME/bin/java" -version 2>&1 | grep -q '11\.0'; then
+  echo "JAVA_HOME is not JDK 11; running setup-workspace.sh" >&2
+  ./scripts/setup-workspace.sh -q -DskipTests
+  source "$ROOT/tools/env.sh"
+fi
+if ! "$JAVA_HOME/bin/java" -version 2>&1 | grep -q '11\.0'; then
+  echo "Failed to provision JDK 11" >&2
   exit 1
 fi
 export PATH="$JAVA_HOME/bin:$MAVEN_HOME/bin:$PATH"

scripts/setup-workspace.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Prepare Codename One workspace by installing Maven, provisioning JDK 8 and JDK 17,
+# Prepare Codename One workspace by installing Maven, provisioning JDK 11 and JDK 17,
 # building core modules, and installing Maven archetypes.
 set -euo pipefail
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
@@ -19,15 +19,17 @@ case "$arch_name" in
   *) echo "Unsupported architecture: $arch_name" >&2; exit 1 ;;
   esac
 
-JDK8_URL="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_${arch}_${os}_hotspot_8u442b06.tar.gz"
+JDK11_URL="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.28%2B6/OpenJDK11U-jdk_${arch}_${os}_hotspot_11.0.28_6.tar.gz"
 JDK17_URL="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_${arch}_${os}_hotspot_17.0.16_8.tar.gz"
 MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz"
 
 install_jdk() {
   local url="$1" dest_var="$2"
   local tmp="$TOOLS/jdk.tgz"
+  echo "Downloading JDK from $url"
   curl -fL "$url" -o "$tmp"
-  local top=$(tar -tzf "$tmp" | head -1 | cut -d/ -f1)
+  local top
+  top=$(tar -tzf "$tmp" 2>/dev/null | head -1 | cut -d/ -f1 || true)
   tar -xzf "$tmp" -C "$TOOLS"
   rm "$tmp"
   local home="$TOOLS/$top"
@@ -37,18 +39,18 @@ install_jdk() {
   eval "$dest_var=\"$home\""
 }
 
-if ! [ -x "${JAVA_HOME:-}/bin/java" ] || ! "$JAVA_HOME/bin/java" -version 2>&1 | grep -q '1\.8'; then
-  echo "Downloading JDK 8 (this may take a while)..."
-  install_jdk "$JDK8_URL" JAVA_HOME
+if ! [ -x "${JAVA_HOME:-}/bin/java" ] || ! "$JAVA_HOME/bin/java" -version 2>&1 | grep -q '11\.0'; then
+  echo "Provisioning JDK 11 (this may take a while)..."
+  install_jdk "$JDK11_URL" JAVA_HOME
 fi
 
 if ! [ -x "${JAVA_HOME_17:-}/bin/java" ] || ! "$JAVA_HOME_17/bin/java" -version 2>&1 | grep -q '17\.0'; then
-  echo "Downloading JDK 17 (this may take a while)..."
+  echo "Provisioning JDK 17 (this may take a while)..."
   install_jdk "$JDK17_URL" JAVA_HOME_17
 fi
 
 if ! [ -x "${MAVEN_HOME:-}/bin/mvn" ]; then
-  echo "Downloading Maven..."
+  echo "Downloading Maven from $MAVEN_URL"
   tmp="$TOOLS/maven.tgz"
   curl -fL "$MAVEN_URL" -o "$tmp"
   tar -xzf "$tmp" -C "$TOOLS"