Kotlin 2.0.20 & Gradle 8.8.

kosi-libs · Sep 23, 2024 · d1642ad · d1642ad
1 parent 5034c5e
commit d1642ad
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 18 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,22 +7,22 @@ plugins {
     alias(libs.plugins.kotlin.jvm)
     `kotlin-dsl`
     `maven-publish`
-    id("org.ajoberstar.git-publish") version "4.1.1"
-    id("org.ajoberstar.grgit") version "5.0.0"
+    alias(libs.plugins.git.gradle)
+    alias(libs.plugins.git.publish)
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath("com.squareup.okhttp3:okhttp:4.9.0")
+        classpath(libs.okhttp)
     }
 }
 
 allprojects {
     group = "org.kodein.internal.gradle"
-    version = "8.7.1"
+    version = "8.8.0"
 }
 
 repositories {

diff --git a/gradle/globals.versions.toml b/gradle/globals.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-kotlin = "2.0.0"
+kotlin = "2.0.20"
 dokka = "1.9.20"
-android-gradle-plugin = "8.2.0"
+android-gradle-plugin = "8.2.2"
 android-ndk = "25.2.9519653"
 
 [plugins]

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,21 @@
 [versions]
+buildconfig = "5.5.0"
+git-gradle = "5.2.2"
+git-publish = "4.2.2"
+gradle-enterprisePlugin = "3.18.1"
+gradle-publishPlugin = "1.3.0"
 # https://docs.gradle.org/current/userguide/compatibility.html#kotlin
-kotlin = "1.9.20"
-gradle-publishPlugin = "1.2.1"
-gradle-enterprisePlugin = "3.15.1"
+kotlin = "1.9.22"
+okhttp = "4.12.0"
 
 [plugins]
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildconfig" }
+git-gradle = { id = "org.ajoberstar.grgit", version.ref = "git-gradle" }
+git-publish = { id = "org.ajoberstar.git-publish", version.ref = "git-publish" }
 gradle-enterprise = { id = "com.gradle.enterprise", version.ref = "gradle-enterprisePlugin" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 
 [libraries]
-gradle-publishPlugin = { module = "com.gradle.publish:plugin-publish-plugin", version.ref = "gradle-publishPlugin" }
 gradle-enterprisePlugin = { module = "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin", version.ref = "gradle-enterprisePlugin" }
+gradle-publishPlugin = { module = "com.gradle.publish:plugin-publish-plugin", version.ref = "gradle-publishPlugin" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
diff --git a/kodein-internal-gradle-settings/build.gradle.kts b/kodein-internal-gradle-settings/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-    kotlin("jvm")
-    id("org.gradle.kotlin.kotlin-dsl")
+    alias(libs.plugins.kotlin.jvm)
+    `kotlin-dsl`
     `maven-publish`
-    id("com.github.gmazzo.buildconfig") version "3.1.0"
+    alias(libs.plugins.buildconfig)
 }
 
 repositories {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.enterprise") version "3.15.1"
+    id("com.gradle.enterprise") version "3.18.1"
 }
 
 rootProject.name = "kodein-internal-gradle-plugin"

diff --git a/src/main/kotlin/org/kodein/internal/gradle/KodeinMppExtension.kt b/src/main/kotlin/org/kodein/internal/gradle/KodeinMppExtension.kt
@@ -4,6 +4,7 @@ import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.NamedDomainObjectProvider
 import org.gradle.api.Project
 import org.gradle.internal.os.OperatingSystem
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
@@ -17,7 +18,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithHostTests
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWasmJsTargetDsl
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWasmTargetDsl

diff --git a/src/main/kotlin/org/kodein/internal/gradle/KodeinMppPlugin.kt b/src/main/kotlin/org/kodein/internal/gradle/KodeinMppPlugin.kt
@@ -91,7 +91,7 @@ public class KodeinMppPlugin : KtPlugin<Project> {
                                     }
                                     tasks.named(processResourcesTaskName).configure { enabled = false }
                                 }
-                                binaries.configureEach { linkTask.enabled = false }
+                                binaries.configureEach { linkTaskProvider.configure { enabled = false } }
                             }
                         }
                 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,7 +91,7 @@ public class KodeinMppPlugin : KtPlugin<Project> { @@
                                         }
                                         tasks.named(processResourcesTaskName).configure { enabled = false }
                                     }
-                                    binaries.configureEach { linkTask.enabled = false }
+                                    binaries.configureEach { linkTaskProvider.configure { enabled = false } }
                                 }
                             }
                     }
@@ Expand Down @@