diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
| commit | a90a5cba08fdf6c0ceb95101c275108a152a3aed (patch) | |
| tree | 532507288f3defd7f4dcf1af49698bcb76034855 /python/mozboot | |
| parent | Adding debian version 126.0.1-1. (diff) | |
| download | firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'python/mozboot')
| -rw-r--r-- | python/mozboot/mozboot/android.py | 8 | ||||
| -rw-r--r-- | python/mozboot/mozboot/mozillabuild.py | 2 | ||||
| -rw-r--r-- | python/mozboot/mozboot/util.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/python/mozboot/mozboot/android.py b/python/mozboot/mozboot/android.py index 5c71339fa3..82cde01c8a 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.10" -JAVA_VERSION_PATCH = "7" +JAVA_VERSION_MINOR = "0.11" +JAVA_VERSION_PATCH = "9" ANDROID_NDK_EXISTS = """ Looks like you have the correct version of the Android NDK installed at: @@ -824,7 +824,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.10%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.10_7.tar.gz + # download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz java_url = ( "https://github.com/adoptium/temurin{major}-binaries/releases/" "download/jdk-{major}.{minor}%2B{patch}/" @@ -842,7 +842,7 @@ def ensure_java(os_name, os_arch): def java_bin_path(os_name, toolchain_path: Path): - # Like jdk-17.0.10+7 + # Like jdk-17.0.11+9 jdk_folder = "jdk-{major}.{minor}+{patch}".format( major=JAVA_VERSION_MAJOR, minor=JAVA_VERSION_MINOR, patch=JAVA_VERSION_PATCH ) diff --git a/python/mozboot/mozboot/mozillabuild.py b/python/mozboot/mozboot/mozillabuild.py index 13991750cf..55a3cca1f5 100644 --- a/python/mozboot/mozboot/mozillabuild.py +++ b/python/mozboot/mozboot/mozillabuild.py @@ -9,7 +9,7 @@ import subprocess import sys from pathlib import Path -from mozbuild.util import mozilla_build_version +from mozbuild.buildversion import mozilla_build_version from packaging.version import Version from mozboot.base import BaseBootstrapper diff --git a/python/mozboot/mozboot/util.py b/python/mozboot/mozboot/util.py index 2d26ffb934..d523319d8b 100644 --- a/python/mozboot/mozboot/util.py +++ b/python/mozboot/mozboot/util.py @@ -11,7 +11,7 @@ import certifi from mach.site import PythonVirtualenv from mach.util import get_state_dir -MINIMUM_RUST_VERSION = "1.74.0" +MINIMUM_RUST_VERSION = "1.76.0" def get_tools_dir(srcdir=False): |