From bb59c484fd57984725c837eafc99fcb7f611c614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Sun, 29 Sep 2024 12:43:34 +0100 Subject: [PATCH 1/2] Proof of concept decouple Gradle JDK from compiling JDK Note: * Gradle 8.x supports 8-23 for running Gradle * Gradle 9.x scheduled to support 17-23 for running Gradle https://docs.gradle.org/current/userguide/compatibility.html --- .github/workflows/build.yml | 2 +- mordant-jvm-ffm/build.gradle.kts | 1 + settings.gradle.kts | 4 ++++ test/proguard/build.gradle.kts | 5 +++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6549b93f6..d84d250c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 22 + java-version: 17 - uses: gradle/actions/setup-gradle@v3 - name: Run tests run: >- diff --git a/mordant-jvm-ffm/build.gradle.kts b/mordant-jvm-ffm/build.gradle.kts index 28cfa309e..7e483b905 100644 --- a/mordant-jvm-ffm/build.gradle.kts +++ b/mordant-jvm-ffm/build.gradle.kts @@ -5,6 +5,7 @@ plugins { kotlin { jvm() + jvmToolchain(22) sourceSets { commonMain.dependencies { implementation(project(":mordant")) diff --git a/settings.gradle.kts b/settings.gradle.kts index d530e0bc7..1c1437624 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -33,3 +33,7 @@ pluginManagement { mavenCentral() } } + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} diff --git a/test/proguard/build.gradle.kts b/test/proguard/build.gradle.kts index f52475951..07c6de915 100644 --- a/test/proguard/build.gradle.kts +++ b/test/proguard/build.gradle.kts @@ -51,6 +51,11 @@ val r8JarProvider by tasks.register("r8Jar") { inputs.files(fatJarFile, rulesFile) outputs.file(r8File) + javaLauncher = javaToolchains.launcherFor { + languageVersion.set(JavaLanguageVersion.of(22)) + vendor = JvmVendorSpec.AZUL // Zulu + } + classpath(r8) mainClass.set("com.android.tools.r8.R8") args = listOf( From b3d1d11bb582cd2f446d25081ad907e0ad12df62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Sun, 29 Sep 2024 13:00:19 +0100 Subject: [PATCH 2/2] gradlew apiDump --- mordant/api/mordant.api | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mordant/api/mordant.api b/mordant/api/mordant.api index 86f9075c7..987e1d982 100644 --- a/mordant/api/mordant.api +++ b/mordant/api/mordant.api @@ -436,10 +436,6 @@ public final class com/github/ajalt/mordant/rendering/Line : java/util/List, kot public synthetic fun add (Ljava/lang/Object;)Z public fun addAll (ILjava/util/Collection;)Z public fun addAll (Ljava/util/Collection;)Z - public fun addFirst (Lcom/github/ajalt/mordant/rendering/Span;)V - public synthetic fun addFirst (Ljava/lang/Object;)V - public fun addLast (Lcom/github/ajalt/mordant/rendering/Span;)V - public synthetic fun addLast (Ljava/lang/Object;)V public fun clear ()V public final fun component1 ()Ljava/util/List; public final fun component2 ()Lcom/github/ajalt/mordant/rendering/TextStyle; @@ -467,10 +463,6 @@ public final class com/github/ajalt/mordant/rendering/Line : java/util/List, kot public synthetic fun remove (I)Ljava/lang/Object; public fun remove (Ljava/lang/Object;)Z public fun removeAll (Ljava/util/Collection;)Z - public fun removeFirst ()Lcom/github/ajalt/mordant/rendering/Span; - public synthetic fun removeFirst ()Ljava/lang/Object; - public fun removeLast ()Lcom/github/ajalt/mordant/rendering/Span; - public synthetic fun removeLast ()Ljava/lang/Object; public fun replaceAll (Ljava/util/function/UnaryOperator;)V public fun retainAll (Ljava/util/Collection;)Z public fun set (ILcom/github/ajalt/mordant/rendering/Span;)Lcom/github/ajalt/mordant/rendering/Span;