Test Kotlin K2

Vampire · Jun 24, 2024 · 634d4b7 · 634d4b7
1 parent 78527ce
commit 634d4b7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/gradle-plugin/gradle.properties b/gradle-plugin/gradle.properties
@@ -1,7 +1,7 @@
 group = io.github.sgrishchenko
 version = 1.0.0-alpha.42
 
-kotlinVersion = 1.9.23
+kotlinVersion = 2.0.0-RC2
 publishVersion = 1.2.1
 
 jacksonVersion = 2.17.0

diff --git a/...adle-plugin/src/main/kotlin/io/github/sgrishchenko/karakum/gradle/plugin/KarakumPlugin.kt b/...adle-plugin/src/main/kotlin/io/github/sgrishchenko/karakum/gradle/plugin/KarakumPlugin.kt
@@ -43,7 +43,7 @@ class KarakumPlugin : Plugin<Project> {
 
                 extensionSource.convention(karakum.extensionSource)
 
-                val npmProjectDirectory = provider { kotlinJsCompilation.npmProject.dir }
+                val npmProjectDirectory = kotlinJsCompilation.npmProject.dir.map { it.asFile }
                 destinationDirectory.convention(layout.dir(npmProjectDirectory).map { it.dir("karakum") })
             }
 

diff --git a/...-plugin/src/main/kotlin/io/github/sgrishchenko/karakum/gradle/plugin/ProjectExtensions.kt b/...-plugin/src/main/kotlin/io/github/sgrishchenko/karakum/gradle/plugin/ProjectExtensions.kt
@@ -4,9 +4,9 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
+import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation
 
-internal val Project.kotlinJsCompilation: KotlinJsCompilation
+internal val Project.kotlinJsCompilation: KotlinJsIrCompilation
     get() {
         val extension = extensions.getByType<KotlinMultiplatformExtension>()
         val target = extension.js()

diff --git a/...lugin/src/main/kotlin/io/github/sgrishchenko/karakum/gradle/plugin/tasks/KarakumConfig.kt b/...lugin/src/main/kotlin/io/github/sgrishchenko/karakum/gradle/plugin/tasks/KarakumConfig.kt
@@ -62,7 +62,7 @@ abstract class KarakumConfig : DefaultTask() {
 
     private fun replaceCwd(configNode: JsonNode) {
         configNode as ObjectNode
-        configNode.put("cwd", project.kotlinJsCompilation.npmProject.dir.absolutePath)
+        configNode.put("cwd", project.kotlinJsCompilation.npmProject.dir.get().asFile.absolutePath)
     }
 
     private fun replaceOutput(configNode: JsonNode) {

diff --git a/...gin/src/main/kotlin/io/github/sgrishchenko/karakum/gradle/plugin/tasks/KarakumGenerate.kt b/...gin/src/main/kotlin/io/github/sgrishchenko/karakum/gradle/plugin/tasks/KarakumGenerate.kt
@@ -7,7 +7,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.*
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
+import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation
 import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies
 import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
 
@@ -20,7 +20,7 @@ abstract class KarakumGenerate : DefaultTask(), RequiresNpmDependencies {
     abstract val extensionDirectory: DirectoryProperty
 
     @get:Internal
-    override val compilation: KotlinJsCompilation = project.kotlinJsCompilation
+    override val compilation: KotlinJsIrCompilation = project.kotlinJsCompilation
 
     @get:Internal
     override val requiredNpmDependencies = setOf(