Fix Gradle plugin compatibility with Kotlin 1.7.0 release

Backward compatability should also work.
Kotlin · Apr 5, 2022 · 3074aa6 · 3074aa6
1 parent e069e2f
commit 3074aa6
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/...icfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt b/...icfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.gradle.plugin.*
 import java.io.*
 import java.util.*
 import java.util.concurrent.*
+import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompileTool
 
 private const val EXTENSION_NAME = "atomicfu"
 private const val ORIGINAL_DIR_NAME = "originalClassesDir"
@@ -207,8 +208,22 @@ fun Project.configureMultiplatformPluginTasks() {
                     Callable { originalDirsByCompilation[mainCompilation]!! }
                 )
 
-                (tasks.findByName(compilation.compileKotlinTaskName) as? AbstractCompile)?.classpath =
-                    originalMainClassesDirs + compilation.compileDependencyFiles - mainCompilation.output.classesDirs
+                // KGP >= 1.7.0 has breaking changes in task hierarchy:
+                // https://youtrack.jetbrains.com/issue/KT-32805#focus=Comments-27-5915479.0-0
+                val (majorVersion, minorVersion) = getKotlinPluginVersion()
+                    .split('.')
+                    .take(2)
+                    .map { it.toInt() }
+                if (majorVersion == 1 && minorVersion < 7) {
+                    (tasks.findByName(compilation.compileKotlinTaskName) as? AbstractCompile)?.classpath =
+                        originalMainClassesDirs + compilation.compileDependencyFiles - mainCompilation.output.classesDirs
+                } else {
+                    (tasks.findByName(compilation.compileKotlinTaskName) as? AbstractKotlinCompileTool<*>)
+                        ?.libraries
+                        ?.setFrom(
+                            originalMainClassesDirs + compilation.compileDependencyFiles - mainCompilation.output.classesDirs
+                        )
+                }
 
                 (tasks.findByName("${target.name}${compilation.name.capitalize()}") as? Test)?.classpath =
                     originalMainClassesDirs + (compilation as KotlinCompilationToRunnableFiles).runtimeDependencyFiles - mainCompilation.output.classesDirs