Merge pull request #291 from usefulness/renovate/kotlin-monorepo

usefulness · Jul 6, 2023 · cd75df3 · cd75df3
2 parents c289cc0 + 35c81ae
commit cd75df3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapperKt
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -16,11 +15,10 @@ commonConfig {
 
 allprojects {
     pluginManager.withPlugin("kotlin") { plugin ->
-        def kotlinVersion = KotlinPluginWrapperKt.getKotlinPluginVersion(project)
         configurations.matching { it.name != "detekt" }.configureEach {
             resolutionStrategy.eachDependency {
                 if (requested.group == 'org.jetbrains.kotlin' && requested.name.startsWith("kotlin")) {
-                    useVersion kotlinVersion
+                    useVersion libs.versions.mavencentral.kotlin.get()
                 }
             }
         }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 gradle-starter = "0.61.1"
 gradle-gradledoctor = "0.8.1"
 gradle-johnrengelman-shadow = "8.1.1"
-mavencentral-kotlin = "1.8.22"
+mavencentral-kotlin = "1.9.0"
 mavencentral-junit = "5.9.3"
 mavencentral-assertj = "3.24.2"
 mavencentral-coroutines = "1.7.2"
@@ -33,7 +33,6 @@ jetbrains-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.
 
 [plugins]
 osacky-gradledoctor = { id = "com.osacky.doctor", version.ref = "gradle-gradledoctor" }
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "mavencentral-kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "mavencentral-kotlin" }
 starter-config = { id = "com.starter.config", version.ref = "gradle-starter" }
 starter-library-kotlin = { id = "com.starter.library.kotlin", version.ref = "gradle-starter" }