From 0e2bb218cfef496f1aaf45dbeb2633b2e8a67091 Mon Sep 17 00:00:00 2001 From: Ronald Brill Date: Sun, 1 Jun 2025 09:28:17 +0200 Subject: [PATCH 1/2] revert org.gradle.toolchains.foojay-resolver-convention to version 0.10.0 because 1.0.0 requires jdk 17 --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 58089905ee..69e507c9ba 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0' id 'org.jetbrains.kotlin.jvm' version '2.1.21' apply false } rootProject.name = 'rhino-root' From c0a8fbdc708b188c7649c805fa423cc84d6a7be5 Mon Sep 17 00:00:00 2001 From: Ronald Brill Date: Sun, 1 Jun 2025 09:28:55 +0200 Subject: [PATCH 2/2] had to update this to make the check working again --- tests/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/build.gradle b/tests/build.gradle index c25081307a..e091984801 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -50,7 +50,7 @@ test { systemProperty 'test262properties', System.getProperty('test262properties') if (System.getProperty('updateTest262properties') != null) { - if (System.getenv("RHINO_TEST_JAVA_VERSION") != "11") { + if ("11".equals(System.getenv("RHINO_TEST_JAVA_VERSION"))) { System.out.println("Test262 properties update is only accurate on Java 11 and you have " + JavaVersion.current()) System.out.println("Set RHINO_TEST_JAVA_VERSION in the environment to use this feature") throw new Exception("Incorrect Java version for Test 262 properties update")