Merge pull request #115 from DRSchlaubi/renovate/major-kotlin-depende…

…ncies
goncalossilva · Jul 7, 2024 · 0df1e12 · 0df1e12
2 parents 900c618 + c5915a2
commit 0df1e12
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 23 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-useanybrowser = "0.2.1"
-kotlin = "1.9.24"
+useanybrowser = "0.3.0"
+kotlin = "2.0.0"
 buildconfig = "5.3.5"
 gradle-publish = "1.2.1"
 nexus-publish = "2.0.0"

diff --git a/resources-library/build.gradle.kts b/resources-library/build.gradle.kts
@@ -1,5 +1,7 @@
 import org.gradle.api.publish.maven.tasks.AbstractPublishToMaven
 import org.gradle.plugins.signing.Sign
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
@@ -25,8 +27,9 @@ kotlin {
     explicitApi()
 
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_1_8
         }
     }
 
@@ -74,13 +77,13 @@ kotlin {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + "-Xexpect-actual-classes"
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
     }
 }
 
 rootProject.configure<NodeJsRootExtension> {
-    nodeVersion = libs.versions.nodejs.get()
+    version = libs.versions.nodejs.get()
 }
 
 rootProject.plugins.withType<YarnPlugin> {

diff --git a/resources-plugin/build.gradle.kts b/resources-plugin/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -27,9 +28,9 @@ tasks.withType<JavaCompile>().configureEach {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.contracts.ExperimentalContracts"
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
+        freeCompilerArgs.add("-opt-in=kotlin.contracts.ExperimentalContracts")
     }
 }
 

diff --git a/resources-plugin/src/main/kotlin/ResourcesPlugin.kt b/resources-plugin/src/main/kotlin/ResourcesPlugin.kt
@@ -2,6 +2,7 @@ package com.goncalossilva.resources
 
 import org.gradle.api.Action
 import org.gradle.api.Task
+import org.gradle.api.file.Directory
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Copy
 import org.gradle.api.tasks.Delete
@@ -10,9 +11,9 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin
 import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
 import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeCompilation
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetContainerDsl
+import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation
 import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
 import java.io.File
 import kotlin.contracts.contract
@@ -48,7 +49,7 @@ class ResourcesPlugin : KotlinCompilerPluginSupportPlugin {
                 setupCopyResourcesTask(
                     kotlinCompilation = kotlinCompilation,
                     taskName = getTaskName("copyResources", binary.name, target.targetName),
-                    outputDir = binary.outputDirectory,
+                    outputDir = project.provider { binary.outputDirectory },
                     mustRunAfterTasks = listOf(kotlinCompilation.processResourcesTaskName),
                     dependantTasks = listOf(binary.linkTaskName)
                 )
@@ -62,7 +63,7 @@ class ResourcesPlugin : KotlinCompilerPluginSupportPlugin {
             setupCopyResourcesTask(
                 kotlinCompilation = kotlinCompilation,
                 taskName = getTaskName("copyResources", kotlinCompilation.target.targetName),
-                outputDir = kotlinCompilation.npmProject.dir,
+                outputDir = kotlinCompilation.npmProject.dir.map(Directory::getAsFile),
                 mustRunAfterTasks = mutableListOf(kotlinCompilation.processResourcesTaskName).apply {
                     kotlinCompilation.npmProject.nodeJs.npmInstallTaskProvider.let {
                         add(":${it.name}")
@@ -102,18 +103,18 @@ class ResourcesPlugin : KotlinCompilerPluginSupportPlugin {
 
     private fun isJsNodeCompilation(kotlinCompilation: KotlinCompilation<*>): Boolean {
         contract {
-            returns(true) implies (kotlinCompilation is KotlinJsCompilation)
+            returns(true) implies (kotlinCompilation is KotlinJsIrCompilation)
         }
-        return kotlinCompilation is KotlinJsCompilation && kotlinCompilation.target.let {
+        return kotlinCompilation is KotlinJsIrCompilation && kotlinCompilation.target.let {
             it is KotlinJsSubTargetContainerDsl && it.isNodejsConfigured
         }
     }
 
     private fun isJsBrowserCompilation(kotlinCompilation: KotlinCompilation<*>): Boolean {
         contract {
-            returns(true) implies (kotlinCompilation is KotlinJsCompilation)
+            returns(true) implies (kotlinCompilation is KotlinJsIrCompilation)
         }
-        return kotlinCompilation is KotlinJsCompilation && kotlinCompilation.target.let {
+        return kotlinCompilation is KotlinJsIrCompilation && kotlinCompilation.target.let {
             it is KotlinJsSubTargetContainerDsl && it.isBrowserConfigured
         }
     }
@@ -134,7 +135,7 @@ class ResourcesPlugin : KotlinCompilerPluginSupportPlugin {
     private fun setupCopyResourcesTask(
         kotlinCompilation: KotlinCompilation<*>,
         taskName: String,
-        outputDir: File,
+        outputDir: Provider<File>,
         mustRunAfterTasks: List<String>,
         dependantTasks: List<String>
     ): TaskProvider<Copy>? {

diff --git a/resources-test/build.gradle.kts b/resources-test/build.gradle.kts
@@ -1,6 +1,7 @@
 import com.goncalossilva.useanybrowser.useAnyBrowser
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
@@ -27,12 +28,14 @@ repositories {
 
 kotlin {
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
-        }
         testRuns["test"].executionTask.configure {
             useJUnitPlatform()
         }
+
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_1_8
+        }
     }
 
     js(IR) {
@@ -77,7 +80,7 @@ kotlin {
 }
 
 rootProject.configure<NodeJsRootExtension> {
-    nodeVersion = libs.versions.nodejs.get()
+    version = libs.versions.nodejs.get()
 }
 
 rootProject.plugins.withType<YarnPlugin> {