feat: to 2.1.0

Decodetalkers · Decodetalkers · commit 4c51f6370b87 · 2024-12-24T19:42:23.000+09:00
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -30,5 +30,5 @@ kotlin {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
+    implementation(libs.org.jetbrains.kotlin.gradle.plugin)
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -1 +1,9 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
 rootProject.name = "build-conventions"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -40,6 +40,9 @@ org-openjdk-jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh
 
 org-xerial-sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version = "3.41.2.1" }
 
+# buildSrc
+org-jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin",version.ref = "kotlinVersion" }
+
 [plugins]
 com-github-jk1-tcdeps = { id = "com.github.jk1.tcdeps", version = "1.2" }
 com-jaredsburrows-license = { id = "com.jaredsburrows.license", version = "0.8.42" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,9 +3,6 @@ pluginManagement {
         gradlePluginPortal()
         maven("https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-plugin")
     }
-    plugins {
-        kotlin("jvm") version "2.1.0" apply false
-    }
 }
 
 rootProject.name = "kotlin-language-server"

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@ kotlin {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`dependencies {`
`33`		`- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")`
	`33`	`+ implementation(libs.org.jetbrains.kotlin.gradle.plugin)`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@ pluginManagement {`
`3`	`3`	`gradlePluginPortal()`
`4`	`4`	`maven("https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-plugin")`
`5`	`5`	`}`
`6`		`- plugins {`
`7`		`- kotlin("jvm") version "2.1.0" apply false`
`8`		`- }`
`9`	`6`	`}`
`10`	`7`
`11`	`8`	`rootProject.name = "kotlin-language-server"`