Plugin improvements, K2 flat requirement

lightningkite · Feb 17, 2025 · ffccb0e · ffccb0e
1 parent 4c9f107
commit ffccb0e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,8 +12,8 @@ buildscript {
     }
     dependencies {
         classpath("com.lightningkite:lk-gradle-helpers:1.0.8")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
-        classpath("org.jetbrains.kotlin:kotlin-serialization:2.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
+        classpath("org.jetbrains.kotlin:kotlin-serialization:2.0.0")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0")
         classpath("com.android.tools.build:gradle:8.5.2")
     }

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -5,7 +5,6 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.1.0")
 }
 kotlin {
     jvmToolchain(17)

diff --git a/kotlin-test-manual-plugin/build.gradle.kts b/kotlin-test-manual-plugin/build.gradle.kts
@@ -24,7 +24,6 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.1.0")
     testImplementation(project(":kotlin-test-manual-runtime"))
     testImplementation("junit:junit:4.13.2")
 }

diff --git a/kotlin-test-manual-plugin/src/main/kotlin/KotlinTestManualPlugin.kt b/kotlin-test-manual-plugin/src/main/kotlin/KotlinTestManualPlugin.kt
@@ -2,7 +2,6 @@ package com.lightningkite.testing.manual
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
@@ -18,7 +17,7 @@ class KotlinTestManualPlugin : Plugin<Project> {
         tasks.create("testUpdateHashes") {
             group = "verification"
             val t = this
-            tasks.matching { it is KotlinCompilationTask<*> && it.name.contains("test", true) }.configureEach {
+            tasks.matching { it.name.contains("test", true) && it.name.contains("compile", true) && it.name.contains("kotlin", true) }.configureEach {
                 this.dependsOn(t)
             }
             doLast {