From b09f24229b7b54612a33694668d3e263ec7b7792 Mon Sep 17 00:00:00 2001 From: Simon Hauck Date: Mon, 6 Nov 2023 21:34:20 +0100 Subject: [PATCH 01/16] add test to verify that the plugin can be applied to projects with different kotlin versions and kotlin version 1.9.10 --- plugin-build/plugin/build.gradle.kts | 45 ++++++------ .../gradle/PluginVersionCompatibilityTest.kt | 71 +++++++++++++++++++ .../build.gradle.kts | 6 ++ .../settings.gradle.kts | 9 +++ 4 files changed, 108 insertions(+), 23 deletions(-) create mode 100644 plugin-build/plugin/src/test/java/com/ncorti/ktfmt/gradle/PluginVersionCompatibilityTest.kt create mode 100644 plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/build.gradle.kts create mode 100644 plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/settings.gradle.kts diff --git a/plugin-build/plugin/build.gradle.kts b/plugin-build/plugin/build.gradle.kts index df71d0a..ee0acfb 100644 --- a/plugin-build/plugin/build.gradle.kts +++ b/plugin-build/plugin/build.gradle.kts @@ -14,18 +14,15 @@ java { targetCompatibility = JavaVersion.VERSION_11 } -tasks.withType { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() - } -} +tasks.withType { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } } /** - * We create a configuration that we can resolve by extending [compileOnly]. - * Here we inject the dependencies into TestKit plugin - * classpath via [PluginUnderTestMetadata] to make them available for testing. + * We create a configuration that we can resolve by extending [compileOnly]. Here we inject the + * dependencies into TestKit plugin classpath via [PluginUnderTestMetadata] to make them available + * for testing. */ val integrationTestRuntime: Configuration by configurations.creating + integrationTestRuntime.apply { extendsFrom(configurations.getByName("compileOnly")) attributes { @@ -66,13 +63,18 @@ dependencies { testRuntimeOnly( files( - serviceOf().getModule("gradle-tooling-api-builders") - .classpath.asFiles.first() + serviceOf() + .getModule("gradle-tooling-api-builders") + .classpath + .asFiles + .first() ) ) constraints { implementation(libs.kotlin.compiler.embeddable) { - because("Clash in Kotlin compiler versions - See https://youtrack.jetbrains.com/issue/KT-54236") + because( + "Clash in Kotlin compiler versions - See https://youtrack.jetbrains.com/issue/KT-54236" + ) } } } @@ -99,20 +101,17 @@ signing { useInMemoryPgpKeys(signingKey, signingPwd) } -tasks.withType { - useJUnitPlatform() -} +tasks.withType().configureEach { onlyIf { project.properties["skip-signing"] != "true" } } + +tasks.withType { useJUnitPlatform() } -val persistKtmftVersion by tasks.registering { - inputs.property("ktfmtVersion", libs.ktfmt) - outputs.files(layout.buildDirectory.file("ktfmt-version.txt")) - doLast { - outputs.files.singleFile.writeText(inputs.properties["ktfmtVersion"].toString()) +val persistKtmftVersion by + tasks.registering { + inputs.property("ktfmtVersion", libs.ktfmt) + outputs.files(layout.buildDirectory.file("ktfmt-version.txt")) + doLast { outputs.files.singleFile.writeText(inputs.properties["ktfmtVersion"].toString()) } } -} tasks.named("processResources") { - from(persistKtmftVersion) { - into("com/ncorti/ktfmt/gradle") - } + from(persistKtmftVersion) { into("com/ncorti/ktfmt/gradle") } } diff --git a/plugin-build/plugin/src/test/java/com/ncorti/ktfmt/gradle/PluginVersionCompatibilityTest.kt b/plugin-build/plugin/src/test/java/com/ncorti/ktfmt/gradle/PluginVersionCompatibilityTest.kt new file mode 100644 index 0000000..0b6d8d7 --- /dev/null +++ b/plugin-build/plugin/src/test/java/com/ncorti/ktfmt/gradle/PluginVersionCompatibilityTest.kt @@ -0,0 +1,71 @@ +package com.ncorti.ktfmt.gradle + +import com.google.common.truth.Truth.assertThat +import java.io.File +import java.nio.file.Path +import org.gradle.testkit.runner.GradleRunner +import org.gradle.testkit.runner.TaskOutcome +import org.intellij.lang.annotations.Language +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.io.TempDir +import org.junit.jupiter.params.ParameterizedTest +import org.junit.jupiter.params.provider.ValueSource + +internal class PluginVersionCompatibilityTest { + + @TempDir lateinit var tempDir: File + + private val pluginBuildDirectory = Path.of("./", "../") + + @BeforeEach + fun setUp() { + File(tempDir, "src/main/java").mkdirs() + File("src/test/resources/jvmProject-version-compatibility").copyRecursively(tempDir) + } + + @ParameterizedTest + @ValueSource(strings = ["1.7.20", "1.9.10", "1.9.20"]) + fun `plugin can be applied to projects with different kotlin versions`(kotlinVersion: String) { + // Prevent sharing of classpath + publishPluginToMavenLocal() + + replaceKotlinVersion(kotlinVersion) + + createTempFile(content = "val answer = 42\n") + val result = + GradleRunner.create() + .withProjectDir(tempDir) + .withArguments("ktfmtCheckMain", "--info") + .build() + + assertThat(result.task(":ktfmtCheckMain")?.outcome).isEqualTo(TaskOutcome.SUCCESS) + } + + private fun publishPluginToMavenLocal() { + GradleRunner.create() + .withProjectDir(pluginBuildDirectory.toFile()) + .withArguments( + "plugin:publishToMavenLocal", + "-PVERSION=0.0.1-compatibility-check", + "-Pskip-signing=true" + ) + .build() + } + + private fun replaceKotlinVersion(version: String) { + val file = tempDir.resolve("build.gradle.kts") + val updatedKotlinVersion = file.readText().replace("KOTLIN_VERSION_PLACEHOLDER", version) + + file.writeText(updatedKotlinVersion) + } + + private fun createTempFile( + @Language("kotlin") content: String, + fileName: String = "TestFile.kt", + path: String = "src/main/java" + ) = + File(File(tempDir, path), fileName).apply { + createNewFile() + writeText(content) + } +} diff --git a/plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/build.gradle.kts b/plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/build.gradle.kts new file mode 100644 index 0000000..d7c27d9 --- /dev/null +++ b/plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/build.gradle.kts @@ -0,0 +1,6 @@ +plugins { + kotlin("jvm") version "KOTLIN_VERSION_PLACEHOLDER" + id("com.ncorti.ktfmt.gradle") version "0.0.1-compatibility-check" +} + +repositories { mavenCentral() } diff --git a/plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/settings.gradle.kts b/plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/settings.gradle.kts new file mode 100644 index 0000000..e5225eb --- /dev/null +++ b/plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/settings.gradle.kts @@ -0,0 +1,9 @@ +rootProject.name = ("test-fixtures") + +pluginManagement { + repositories { + mavenLocal() + mavenCentral() + gradlePluginPortal() + } +} From 6d978cb57893fd02b6c09cd9fc726f2d24772066 Mon Sep 17 00:00:00 2001 From: Simon Hauck Date: Mon, 6 Nov 2023 21:35:04 +0100 Subject: [PATCH 02/16] increase kotlin version to 1.9.20 to showcase the failing PluginVersionCompatibilityTest to a project with kotlin version 1.9.10 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7c5edf4..c1aa63b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ binaryCompatibilityValidator = "0.13.2" detekt = "1.23.3" diffUtils = "4.12" junit = "5.10.1" -kotlin = "1.9.10" +kotlin = "1.9.20" ktfmt-plugin = "0.15.1" ktfmt = "0.46" pluginPublish = "1.2.1" From b2d96c964de293b0723187871616873e12164cdd Mon Sep 17 00:00:00 2001 From: Simon Hauck Date: Mon, 6 Nov 2023 21:39:15 +0100 Subject: [PATCH 03/16] remove kotlin compiler embeddable dependency to apply plugin successfully to projects with different kotlin versions --- plugin-build/plugin/build.gradle.kts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/plugin-build/plugin/build.gradle.kts b/plugin-build/plugin/build.gradle.kts index ee0acfb..69057e0 100644 --- a/plugin-build/plugin/build.gradle.kts +++ b/plugin-build/plugin/build.gradle.kts @@ -70,13 +70,6 @@ dependencies { .first() ) ) - constraints { - implementation(libs.kotlin.compiler.embeddable) { - because( - "Clash in Kotlin compiler versions - See https://youtrack.jetbrains.com/issue/KT-54236" - ) - } - } } gradlePlugin { From 9244a85196c77a8e95661ba1007425aced80f875 Mon Sep 17 00:00:00 2001 From: Simon Hauck Date: Mon, 6 Nov 2023 21:39:15 +0100 Subject: [PATCH 04/16] remove formatting changes --- plugin-build/plugin/build.gradle.kts | 39 ++++++++++++++++------------ 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/plugin-build/plugin/build.gradle.kts b/plugin-build/plugin/build.gradle.kts index 69057e0..48a66c5 100644 --- a/plugin-build/plugin/build.gradle.kts +++ b/plugin-build/plugin/build.gradle.kts @@ -14,15 +14,18 @@ java { targetCompatibility = JavaVersion.VERSION_11 } -tasks.withType { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } } +tasks.withType { + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() + } +} /** - * We create a configuration that we can resolve by extending [compileOnly]. Here we inject the - * dependencies into TestKit plugin classpath via [PluginUnderTestMetadata] to make them available - * for testing. + * We create a configuration that we can resolve by extending [compileOnly]. + * Here we inject the dependencies into TestKit plugin + * classpath via [PluginUnderTestMetadata] to make them available for testing. */ val integrationTestRuntime: Configuration by configurations.creating - integrationTestRuntime.apply { extendsFrom(configurations.getByName("compileOnly")) attributes { @@ -63,11 +66,8 @@ dependencies { testRuntimeOnly( files( - serviceOf() - .getModule("gradle-tooling-api-builders") - .classpath - .asFiles - .first() + serviceOf().getModule("gradle-tooling-api-builders") + .classpath.asFiles.first() ) ) } @@ -96,15 +96,20 @@ signing { tasks.withType().configureEach { onlyIf { project.properties["skip-signing"] != "true" } } -tasks.withType { useJUnitPlatform() } +tasks.withType { + useJUnitPlatform() +} -val persistKtmftVersion by - tasks.registering { - inputs.property("ktfmtVersion", libs.ktfmt) - outputs.files(layout.buildDirectory.file("ktfmt-version.txt")) - doLast { outputs.files.singleFile.writeText(inputs.properties["ktfmtVersion"].toString()) } +val persistKtmftVersion by tasks.registering { + inputs.property("ktfmtVersion", libs.ktfmt) + outputs.files(layout.buildDirectory.file("ktfmt-version.txt")) + doLast { + outputs.files.singleFile.writeText(inputs.properties["ktfmtVersion"].toString()) } +} tasks.named("processResources") { - from(persistKtmftVersion) { into("com/ncorti/ktfmt/gradle") } + from(persistKtmftVersion) { + into("com/ncorti/ktfmt/gradle") + } } From d650061b09f562b001aaf42cf9984792bae4863d Mon Sep 17 00:00:00 2001 From: Simon Hauck Date: Tue, 7 Nov 2023 06:45:21 +0100 Subject: [PATCH 05/16] add changes to changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ba1b17..37cb20c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ Please add your entries according to this format. ## Unreleased +- Remove ``kotlin-compiler-embeddable`` dependency to allow update on Kotlin version 1.9.20 + ## Version 0.15.1 *(2023-10-31)* - Kotlin version reverted to 1.9.10 From 8c1791db4ca534eb8d554649cf0acdc2e4597e0b Mon Sep 17 00:00:00 2001 From: Simon Hauck Date: Wed, 22 Nov 2023 21:56:21 +0100 Subject: [PATCH 06/16] add changelog entry for kotlin version bump --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37cb20c..6eeec13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Please add your entries according to this format. ## Unreleased - Remove ``kotlin-compiler-embeddable`` dependency to allow update on Kotlin version 1.9.20 +- Kotlin to 1.9.20 ## Version 0.15.1 *(2023-10-31)* From c01a53f478baa86b7c29974ced9640d8132328ff Mon Sep 17 00:00:00 2001 From: Simon Hauck Date: Fri, 24 Nov 2023 13:58:49 +0100 Subject: [PATCH 07/16] bump version of this plugin for version compatibility test to maximum to prevent conflicts with renovate --- .../com/ncorti/ktfmt/gradle/PluginVersionCompatibilityTest.kt | 2 +- .../resources/jvmProject-version-compatibility/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin-build/plugin/src/test/java/com/ncorti/ktfmt/gradle/PluginVersionCompatibilityTest.kt b/plugin-build/plugin/src/test/java/com/ncorti/ktfmt/gradle/PluginVersionCompatibilityTest.kt index 0b6d8d7..1f5326f 100644 --- a/plugin-build/plugin/src/test/java/com/ncorti/ktfmt/gradle/PluginVersionCompatibilityTest.kt +++ b/plugin-build/plugin/src/test/java/com/ncorti/ktfmt/gradle/PluginVersionCompatibilityTest.kt @@ -46,7 +46,7 @@ internal class PluginVersionCompatibilityTest { .withProjectDir(pluginBuildDirectory.toFile()) .withArguments( "plugin:publishToMavenLocal", - "-PVERSION=0.0.1-compatibility-check", + "-PVERSION=99.99.99-compatibility-check", "-Pskip-signing=true" ) .build() diff --git a/plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/build.gradle.kts b/plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/build.gradle.kts index d7c27d9..bd197da 100644 --- a/plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/build.gradle.kts +++ b/plugin-build/plugin/src/test/resources/jvmProject-version-compatibility/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("jvm") version "KOTLIN_VERSION_PLACEHOLDER" - id("com.ncorti.ktfmt.gradle") version "0.0.1-compatibility-check" + id("com.ncorti.ktfmt.gradle") version "99.99.99-compatibility-check" } repositories { mavenCentral() } From a322a27d57d4817f8e39ff9669f1a9a45b82808a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 20:11:26 +0000 Subject: [PATCH 08/16] Update dependency com.android.library to v8.1.3 (#224) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c1aa63b..b00694c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.1.2" +agp = "8.1.3" binaryCompatibilityValidator = "0.13.2" detekt = "1.23.3" diffUtils = "4.12" From e58d716da032ebf69b2fd4e197720d564a506fb9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 21:09:38 +0000 Subject: [PATCH 09/16] Update dependency com.android.library to v8.1.4 (#225) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b00694c..adbe57e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.1.3" +agp = "8.1.4" binaryCompatibilityValidator = "0.13.2" detekt = "1.23.3" diffUtils = "4.12" From e363af02c2fc36e423dcc43b2958fa0e3857042e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:02:09 +0000 Subject: [PATCH 10/16] Update dependency com.github.ben-manes.versions to v0.50.0 (#226) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index adbe57e..7505b71 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ ktfmt-plugin = "0.15.1" ktfmt = "0.46" pluginPublish = "1.2.1" truth = "1.1.5" -versionCheck = "0.49.0" +versionCheck = "0.50.0" [plugins] android-library = { id = "com.android.library", version.ref = "agp" } From 441ad6e302258dbe33445ddf5f6d881903c0f62d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 13:44:41 +0000 Subject: [PATCH 11/16] Update dependency org.jetbrains.kotlin:kotlin-compiler-embeddable to v1.9.21 (#228) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7505b71..40ae42e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ binaryCompatibilityValidator = "0.13.2" detekt = "1.23.3" diffUtils = "4.12" junit = "5.10.1" -kotlin = "1.9.20" +kotlin = "1.9.21" ktfmt-plugin = "0.15.1" ktfmt = "0.46" pluginPublish = "1.2.1" From f7ed8cbab7eacc23a3cd3541706a0f756848f639 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 13:45:10 +0000 Subject: [PATCH 12/16] Update kotlin to v1.9.21 (#229) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> From c5993e8b246657ec6ffcabe3c210a694ecb2add6 Mon Sep 17 00:00:00 2001 From: Simon Hauck Date: Mon, 6 Nov 2023 21:34:20 +0100 Subject: [PATCH 13/16] rebase commit, resolve conflicts --- plugin-build/plugin/build.gradle.kts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/plugin-build/plugin/build.gradle.kts b/plugin-build/plugin/build.gradle.kts index 48a66c5..a464a70 100644 --- a/plugin-build/plugin/build.gradle.kts +++ b/plugin-build/plugin/build.gradle.kts @@ -14,18 +14,15 @@ java { targetCompatibility = JavaVersion.VERSION_11 } -tasks.withType { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() - } -} +tasks.withType { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } } /** - * We create a configuration that we can resolve by extending [compileOnly]. - * Here we inject the dependencies into TestKit plugin - * classpath via [PluginUnderTestMetadata] to make them available for testing. + * We create a configuration that we can resolve by extending [compileOnly]. Here we inject the + * dependencies into TestKit plugin classpath via [PluginUnderTestMetadata] to make them available + * for testing. */ val integrationTestRuntime: Configuration by configurations.creating + integrationTestRuntime.apply { extendsFrom(configurations.getByName("compileOnly")) attributes { @@ -66,8 +63,11 @@ dependencies { testRuntimeOnly( files( - serviceOf().getModule("gradle-tooling-api-builders") - .classpath.asFiles.first() + serviceOf() + .getModule("gradle-tooling-api-builders") + .classpath + .asFiles + .first() ) ) } From 91188e3023cd9c255e9499b5a760d34881431ee6 Mon Sep 17 00:00:00 2001 From: Simon Hauck Date: Mon, 6 Nov 2023 21:39:15 +0100 Subject: [PATCH 14/16] remove formatting changes --- plugin-build/plugin/build.gradle.kts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/plugin-build/plugin/build.gradle.kts b/plugin-build/plugin/build.gradle.kts index a464a70..48a66c5 100644 --- a/plugin-build/plugin/build.gradle.kts +++ b/plugin-build/plugin/build.gradle.kts @@ -14,15 +14,18 @@ java { targetCompatibility = JavaVersion.VERSION_11 } -tasks.withType { kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } } +tasks.withType { + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() + } +} /** - * We create a configuration that we can resolve by extending [compileOnly]. Here we inject the - * dependencies into TestKit plugin classpath via [PluginUnderTestMetadata] to make them available - * for testing. + * We create a configuration that we can resolve by extending [compileOnly]. + * Here we inject the dependencies into TestKit plugin + * classpath via [PluginUnderTestMetadata] to make them available for testing. */ val integrationTestRuntime: Configuration by configurations.creating - integrationTestRuntime.apply { extendsFrom(configurations.getByName("compileOnly")) attributes { @@ -63,11 +66,8 @@ dependencies { testRuntimeOnly( files( - serviceOf() - .getModule("gradle-tooling-api-builders") - .classpath - .asFiles - .first() + serviceOf().getModule("gradle-tooling-api-builders") + .classpath.asFiles.first() ) ) } From e6216935d800834dc534b5c198a7531ce01abef0 Mon Sep 17 00:00:00 2001 From: Simon Hauck Date: Fri, 24 Nov 2023 14:09:08 +0100 Subject: [PATCH 15/16] remove unused kotlin-compiler-embeddable dependency --- CHANGELOG.md | 4 ++-- gradle/libs.versions.toml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eeec13..014fce0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,8 @@ Please add your entries according to this format. ## Unreleased -- Remove ``kotlin-compiler-embeddable`` dependency to allow update on Kotlin version 1.9.20 -- Kotlin to 1.9.20 +- Remove legacy ``kotlin-compiler-embeddable`` dependency to prevent potential Kotlin version conflicts +- Kotlin to 1.9.21 ## Version 0.15.1 *(2023-10-31)* diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 40ae42e..020ad11 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,7 +26,6 @@ agp = { module = "com.android.tools.build:gradle", version.ref = "agp" } junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" } jupiter = { module = "org.junit.jupiter:junit-jupiter" } jupiter-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" } -kotlin-compiler-embeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" } truth = { module = "com.google.truth:truth", version.ref = "truth" } diffUtils = { module = "io.github.java-diff-utils:java-diff-utils", version.ref = "diffUtils" } ktfmt = { module = "com.facebook:ktfmt", version.ref = "ktfmt" } From 22bfea56aba719d12a8e8544e2fa1b8b0783214c Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Fri, 24 Nov 2023 14:14:56 +0000 Subject: [PATCH 16/16] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 014fce0..3da4328 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ Please add your entries according to this format. ## Unreleased -- Remove legacy ``kotlin-compiler-embeddable`` dependency to prevent potential Kotlin version conflicts +- Remove legacy `kotlin-compiler-embeddable` dependency to prevent potential Kotlin version conflicts - Kotlin to 1.9.21 ## Version 0.15.1 *(2023-10-31)*