Introduce Gradle Version Catalog with type-safe project dependencies (#2884)

13 files changed, 14 insertions, 49 deletions

diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts
index fd1d7746..7f3eee42 100644
--- a/integration-tests/build.gradle.kts
+++ b/integration-tests/build.gradle.kts
@@ -3,11 +3,8 @@ plugins {
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
-    api(project(":test-utils"))
-    val coroutines_version: String by project
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
-    val jsoup_version: String by project
-    implementation("org.jsoup:jsoup:$jsoup_version")
-    implementation("org.eclipse.jgit:org.eclipse.jgit:5.12.0.202106070339-r")
+    api(projects.testUtils)
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.jsoup)
+    implementation(libs.eclipse.jgit)
 }
diff --git a/integration-tests/cli/build.gradle.kts b/integration-tests/cli/build.gradle.kts
index c0cb46ee..4e498df1 100644
--- a/integration-tests/cli/build.gradle.kts
+++ b/integration-tests/cli/build.gradle.kts
@@ -10,9 +10,8 @@ evaluationDependsOn(":runners:cli")
 evaluationDependsOn(":plugins:base")
 
 dependencies {
-    implementation(kotlin("stdlib"))
     implementation(kotlin("test-junit"))
-    implementation(project(":integration-tests"))
+    implementation(projects.integrationTests)
 }
 
 /* Create a fat base plugin jar for cli tests */
@@ -23,8 +22,8 @@ val basePluginShadow: Configuration by configurations.creating {
 }
 
 dependencies {
-    basePluginShadow(project(":plugins:base"))
-    basePluginShadow(project(":kotlin-analysis")) // compileOnly in base plugin
+    basePluginShadow(projects.plugins.base)
+    basePluginShadow(projects.kotlinAnalysis) // compileOnly in base plugin
 }
 
 val basePluginShadowJar by tasks.register("basePluginShadowJar", ShadowJar::class) {
@@ -41,4 +40,3 @@ tasks.integrationTest {
     dependsOn(cliJar)
     dependsOn(basePluginShadowJar)
 }
-
diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts
index ffc025de..4c7a0398 100644
--- a/integration-tests/gradle/build.gradle.kts
+++ b/integration-tests/gradle/build.gradle.kts
@@ -5,13 +5,12 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":integration-tests"))
-    implementation(kotlin("stdlib"))
+    implementation(projects.integrationTests)
+
     implementation(kotlin("test-junit"))
     implementation(gradleTestKit())
 
-    val jsoup_version: String by project
-    implementation("org.jsoup:jsoup:$jsoup_version")
+    implementation(libs.jsoup)
 }
 
 tasks.integrationTest {
diff --git a/integration-tests/gradle/projects/it-android-0/build.gradle.kts b/integration-tests/gradle/projects/it-android-0/build.gradle.kts
index 799ec22d..b19b7ebd 100644
--- a/integration-tests/gradle/projects/it-android-0/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-android-0/build.gradle.kts
@@ -14,7 +14,5 @@ android {
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
     implementation("androidx.appcompat:appcompat:1.1.0")
 }
-
diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts
index 44159de0..23f11cbb 100644
--- a/integration-tests/gradle/projects/it-basic/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts
@@ -21,7 +21,6 @@ version = "1.8.10-SNAPSHOT"
 apply(from = "../template.root.gradle.kts")
 
 dependencies {
-    implementation(kotlin("stdlib"))
     testImplementation(kotlin("test-junit"))
 }
 
diff --git a/integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/build.gradle.kts b/integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/build.gradle.kts
index 9492fdc8..9f7e98de 100644
--- a/integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/build.gradle.kts
@@ -2,7 +2,3 @@ plugins {
     kotlin("jvm")
     id("org.jetbrains.dokka")
 }
-
-dependencies {
-    implementation(kotlin("stdlib"))
-}
diff --git a/integration-tests/gradle/projects/it-collector-0/moduleA/moduleC/build.gradle.kts b/integration-tests/gradle/projects/it-collector-0/moduleA/moduleC/build.gradle.kts
index 9492fdc8..9f7e98de 100644
--- a/integration-tests/gradle/projects/it-collector-0/moduleA/moduleC/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-collector-0/moduleA/moduleC/build.gradle.kts
@@ -2,7 +2,3 @@ plugins {
     kotlin("jvm")
     id("org.jetbrains.dokka")
 }
-
-dependencies {
-    implementation(kotlin("stdlib"))
-}
diff --git a/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts b/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts
index ec366c9d..31c1af84 100644
--- a/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts
@@ -13,10 +13,9 @@ kotlin {
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
     implementation(npm("is-sorted", "1.0.5"))
 
     val reactVersion = properties["react_version"]
     implementation("org.jetbrains.kotlin-wrappers:kotlin-react:$reactVersion")
     implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:$reactVersion")
-}
\ No newline at end of file
+}
diff --git a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleB/build.gradle.kts b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleB/build.gradle.kts
index 5f0b69c7..1981701f 100644
--- a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleB/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleB/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
     id("org.jetbrains.dokka")
 }
 
-dependencies {
-    implementation(kotlin("stdlib"))
-}
-
 tasks.withType<DokkaTask>().configureEach {
     moduleName.set("!Module B!")
     dokkaSourceSets.configureEach {
diff --git a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleC/build.gradle.kts b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleC/build.gradle.kts
index e471d375..728e764d 100644
--- a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleC/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleC/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
     id("org.jetbrains.dokka")
 }
 
-dependencies {
-    implementation(kotlin("stdlib"))
-}
-
 tasks.withType<DokkaTask>().configureEach {
     dokkaSourceSets.configureEach {
         includes.from("Module.md")
diff --git a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleD/build.gradle.kts b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleD/build.gradle.kts
index a16e038f..e5edf940 100644
--- a/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleD/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleD/build.gradle.kts
@@ -4,7 +4,3 @@ plugins {
     kotlin("jvm")
     id("org.jetbrains.dokka")
 }
-
-dependencies {
-    implementation(kotlin("stdlib"))
-}
diff --git a/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/build.gradle.kts b/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/build.gradle.kts
index f180628f..e84a74a5 100644
--- a/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/build.gradle.kts
@@ -18,10 +18,6 @@ buildscript {
 
 apply(from = "../template.root.gradle.kts")
 
-dependencies {
-    implementation(kotlin("stdlib"))
-}
-
 fun createTask(name: String) {
     tasks.register(name, org.jetbrains.dokka.gradle.DokkaTask::class) {
         dokkaSourceSets {
@@ -42,4 +38,3 @@ task("runTasks") {
         dependsOn ("task_"+i)
     }
 }
-
diff --git a/integration-tests/maven/build.gradle.kts b/integration-tests/maven/build.gradle.kts
index a2e7c440..99a98649 100644
--- a/integration-tests/maven/build.gradle.kts
+++ b/integration-tests/maven/build.gradle.kts
@@ -6,8 +6,8 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":integration-tests"))
-    implementation(kotlin("stdlib"))
+    implementation(projects.integrationTests)
+
     implementation(kotlin("test-junit"))
 }
 
@@ -15,7 +15,7 @@ tasks.integrationTest {
     dependsOnMavenLocalPublication()
 
     dependsOn(tasks.installMavenBinary)
-    val mvn = setupMavenProperties.mvn
+    val mvn = mavenCliSetup.mvn
     inputs.file(mvn)
 
     val dokka_version: String by project