diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cb6ce6..bf8a5bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ## [Unreleased] ### Changed -- Bump all dependencies to latest. +- Bump required JVM from 11 to 17. ([#63](https://github.com/diffplug/atplug/pull/63)) +- Detect Kotlin version rather than harcode it. ([#64](https://github.com/diffplug/atplug/pull/64)) ## [1.1.1] - 2024-07-06 ### Changed diff --git a/atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/gradle/PlugPlugin.kt b/atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/gradle/PlugPlugin.kt index c5c5ab6..a2de995 100644 --- a/atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/gradle/PlugPlugin.kt +++ b/atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/gradle/PlugPlugin.kt @@ -38,7 +38,11 @@ class PlugPlugin : Plugin { project.plugins.apply(JavaPlugin::class.java) val javaExtension = project.extensions.getByType(JavaPluginExtension::class.java) val main = javaExtension.sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME) - val dep = project.dependencies.create("org.jetbrains.kotlin:kotlin-reflect:1.8.20") + val plugin = + project.plugins.findPlugin("org.jetbrains.kotlin.jvm") + as org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper + val dep = + project.dependencies.create("org.jetbrains.kotlin:kotlin-reflect:${plugin.pluginVersion}") val plugGenConfig = project.configurations.create("plugGenerate") { plugGen: Configuration -> plugGen.extendsFrom( diff --git a/atplug-plugin-gradle/src/test/java/com/diffplug/atplug/tooling/PlugGeneratorTest.kt b/atplug-plugin-gradle/src/test/java/com/diffplug/atplug/tooling/PlugGeneratorTest.kt index 3c09cc7..40a540e 100644 --- a/atplug-plugin-gradle/src/test/java/com/diffplug/atplug/tooling/PlugGeneratorTest.kt +++ b/atplug-plugin-gradle/src/test/java/com/diffplug/atplug/tooling/PlugGeneratorTest.kt @@ -23,7 +23,7 @@ class PlugGeneratorTest : ResourceHarness() { true, listOf( "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1", - "org.jetbrains.kotlin:kotlin-reflect:1.8.20")) + "org.jetbrains.kotlin:kotlin-reflect:2.1.0")) val atplug_runtime = mutableSetOf(findRuntimeJar()) atplug_runtime.addAll(transitives) return atplug_runtime diff --git a/build.gradle b/build.gradle index cf274a0..aa5d484 100644 --- a/build.gradle +++ b/build.gradle @@ -48,6 +48,7 @@ subprojects { dependencies { implementation "org.ow2.asm:asm:9.7.1" implementation 'com.diffplug.gradle:goomph:4.2.0' + implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0' testImplementation 'org.assertj:assertj-core:3.27.3' } tasks.named('test') {