From 4e0036132a7389ee49f291eebec35104711461c6 Mon Sep 17 00:00:00 2001 From: Mads Odgaard Date: Tue, 21 Oct 2025 15:44:47 +0200 Subject: [PATCH 1/3] support Java 11 for SwiftKitCore --- .github/actions/prepare_env/action.yml | 1 + SwiftKitCore/build.gradle | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/actions/prepare_env/action.yml b/.github/actions/prepare_env/action.yml index 3fdd5d4b..83073ad5 100644 --- a/.github/actions/prepare_env/action.yml +++ b/.github/actions/prepare_env/action.yml @@ -13,6 +13,7 @@ runs: distribution: ${{ matrix.jdk_vendor }} java-version: | 24 + 21 17 cache: 'gradle' - name: Set JAVA_HOME_{N} diff --git a/SwiftKitCore/build.gradle b/SwiftKitCore/build.gradle index 82874e20..419ea9b3 100644 --- a/SwiftKitCore/build.gradle +++ b/SwiftKitCore/build.gradle @@ -43,11 +43,13 @@ publishing { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(21)) } - // Support Android 6+ (Java 7) - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 +} + +tasks.withType(JavaCompile).configureEach { + // Support Java 11 + options.release.set(11) } dependencies { From 47af4db6a0c6a10757f06ca225ee1f10c92d84f7 Mon Sep 17 00:00:00 2001 From: Mads Odgaard Date: Tue, 21 Oct 2025 17:05:22 +0200 Subject: [PATCH 2/3] try explicitly specifying java 21 home for Core --- SwiftKitCore/gradle.properties | 1 + 1 file changed, 1 insertion(+) create mode 100644 SwiftKitCore/gradle.properties diff --git a/SwiftKitCore/gradle.properties b/SwiftKitCore/gradle.properties new file mode 100644 index 00000000..9a47c868 --- /dev/null +++ b/SwiftKitCore/gradle.properties @@ -0,0 +1 @@ +org.gradle.java.installations.fromEnv=JAVA_HOME_21,JAVA_HOME_21_X64,JAVA_HOME_21_ARM64 \ No newline at end of file From ad7d8dd52c55652583538a770a4c816aba914aa5 Mon Sep 17 00:00:00 2001 From: Mads Odgaard Date: Wed, 22 Oct 2025 12:34:58 +0200 Subject: [PATCH 3/3] use 24 as toolchain --- .github/actions/prepare_env/action.yml | 1 - SwiftKitCore/build.gradle | 2 +- SwiftKitCore/gradle.properties | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 SwiftKitCore/gradle.properties diff --git a/.github/actions/prepare_env/action.yml b/.github/actions/prepare_env/action.yml index 83073ad5..3fdd5d4b 100644 --- a/.github/actions/prepare_env/action.yml +++ b/.github/actions/prepare_env/action.yml @@ -13,7 +13,6 @@ runs: distribution: ${{ matrix.jdk_vendor }} java-version: | 24 - 21 17 cache: 'gradle' - name: Set JAVA_HOME_{N} diff --git a/SwiftKitCore/build.gradle b/SwiftKitCore/build.gradle index 419ea9b3..b61074a6 100644 --- a/SwiftKitCore/build.gradle +++ b/SwiftKitCore/build.gradle @@ -43,7 +43,7 @@ publishing { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(24)) } } diff --git a/SwiftKitCore/gradle.properties b/SwiftKitCore/gradle.properties deleted file mode 100644 index 9a47c868..00000000 --- a/SwiftKitCore/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -org.gradle.java.installations.fromEnv=JAVA_HOME_21,JAVA_HOME_21_X64,JAVA_HOME_21_ARM64 \ No newline at end of file