From c7f54f6fda25d5ebbc7a2d4f987ec5f140213800 Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Fri, 8 Aug 2025 08:57:51 +0200 Subject: [PATCH] Java: use java 17 in `no-wrapper` tests Gradle 9 requires Java 17. (cherry picked from commit 72843b56e84b97117c785338417810a0cdec8f8d) --- .../java/android-sample-kotlin-build-script-no-wrapper/test.py | 2 +- .../ql/integration-tests/java/android-sample-no-wrapper/test.py | 2 +- .../test.py | 2 +- .../java/android-sample-old-style-no-wrapper/test.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/test.py b/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/test.py index e3a791a59f3d..67b5dde772eb 100644 --- a/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/test.py +++ b/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/test.py @@ -1,2 +1,2 @@ -def test(codeql, use_java_11, java, android_sdk): +def test(codeql, use_java_17, java, android_sdk): codeql.database.create() diff --git a/java/ql/integration-tests/java/android-sample-no-wrapper/test.py b/java/ql/integration-tests/java/android-sample-no-wrapper/test.py index e3a791a59f3d..67b5dde772eb 100644 --- a/java/ql/integration-tests/java/android-sample-no-wrapper/test.py +++ b/java/ql/integration-tests/java/android-sample-no-wrapper/test.py @@ -1,2 +1,2 @@ -def test(codeql, use_java_11, java, android_sdk): +def test(codeql, use_java_17, java, android_sdk): codeql.database.create() diff --git a/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py b/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py index ca4ae04350fe..5730f55d9819 100644 --- a/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py +++ b/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py @@ -1,2 +1,2 @@ -def test(codeql, use_java_11, java, android_sdk, actions_toolchains_file): +def test(codeql, use_java_17, java, android_sdk, actions_toolchains_file): codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)}) diff --git a/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/test.py b/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/test.py index ca4ae04350fe..5730f55d9819 100644 --- a/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/test.py +++ b/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/test.py @@ -1,2 +1,2 @@ -def test(codeql, use_java_11, java, android_sdk, actions_toolchains_file): +def test(codeql, use_java_17, java, android_sdk, actions_toolchains_file): codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})