diff --git a/python/mozboot/mozboot/android.py b/python/mozboot/mozboot/android.py index 0297c37f0e7a..e825adad455b 100644 --- a/python/mozboot/mozboot/android.py +++ b/python/mozboot/mozboot/android.py @@ -42,8 +42,8 @@ AVD_MANIFEST_ARM = Path(__file__).resolve().parent / "android-avds/arm.json" AVD_MANIFEST_ARM64 = Path(__file__).resolve().parent / "android-avds/arm64.json" JAVA_VERSION_MAJOR = "17" -JAVA_VERSION_MINOR = "0.5" -JAVA_VERSION_PATCH = "8" +JAVA_VERSION_MINOR = "0.6" +JAVA_VERSION_PATCH = "10" ANDROID_NDK_EXISTS = """ Looks like you have the correct version of the Android NDK installed at: @@ -829,7 +829,7 @@ def ensure_java(os_name, os_arch): if not java_path.exists(): # e.g. https://github.com/adoptium/temurin17-binaries/releases/ - # download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.5_8.tar.gz + # download/jdk-17.0.6%2B10/OpenJDK17U-jre_x64_linux_hotspot_17.0.6_10.tar.gz java_url = ( "https://github.com/adoptium/temurin{major}-binaries/releases/" "download/jdk-{major}.{minor}%2B{patch}/" @@ -847,7 +847,7 @@ def ensure_java(os_name, os_arch): def java_bin_path(os_name, toolchain_path: Path): - # Like jdk-17.0.5+8 + # Like jdk-17.0.6+10 jdk_folder = "jdk-{major}.{minor}+{patch}".format( major=JAVA_VERSION_MAJOR, minor=JAVA_VERSION_MINOR, patch=JAVA_VERSION_PATCH ) diff --git a/python/mozbuild/mozbuild/test/configure/test_checks_configure.py b/python/mozbuild/mozbuild/test/configure/test_checks_configure.py index eefe166cad43..c82900eed12c 100644 --- a/python/mozbuild/mozbuild/test/configure/test_checks_configure.py +++ b/python/mozbuild/mozbuild/test/configure/test_checks_configure.py @@ -593,7 +593,7 @@ class TestChecksConfigure(unittest.TestCase): javac = mozpath.abspath("/usr/bin/javac") paths = {java: None, javac: None} expected_error_message = ( - "ERROR: Could not locate Java at /mozbuild/jdk/jdk-17.0.5+8/bin, " + "ERROR: Could not locate Java at /mozbuild/jdk/jdk-17.0.6+10/bin, " "please run ./mach bootstrap --no-system-changes\n" ) diff --git a/taskcluster/ci/toolchain/android.yml b/taskcluster/ci/toolchain/android.yml index 1feb0deddf02..06cd95685b5f 100644 --- a/taskcluster/ci/toolchain/android.yml +++ b/taskcluster/ci/toolchain/android.yml @@ -111,7 +111,7 @@ linux64-jdk-repack: toolchain-artifact: project/gecko/jdk/jdk-linux.tar.zst toolchain-alias: linux64-jdk toolchain-env: - JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.5+8" + JAVA_HOME: "/builds/worker/fetches/jdk/jdk-17.0.6+10" linux64-android-sdk-linux-repack: description: "Android SDK (Linux) repack toolchain build"