Centralize adding the kotlin-test library (#6643)

* Centralize adding the kotlin-test library

* apollo-engine-tests is special

Author: martinbonnin

build-logic/src/main/kotlin/Testing.kt

@@ -7,6 +7,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
 fun Project.configureTesting() {
   tasks.withType(Test::class.java) {
@@ -44,19 +45,19 @@ private fun Project.addTestDependencies() {
       is KotlinMultiplatformExtension -> {
         sourceSets.getByName("commonTest") {
           dependencies {
-            implementation(getCatalogLib("kotlin.test"))
+            implementation("org.jetbrains.kotlin:kotlin-test:${getKotlinPluginVersion()}")
           }
         }
         sourceSets.findByName("androidInstrumentedTest")?.apply {
           dependencies {
-            implementation(getCatalogLib("kotlin.test"))
+            implementation("org.jetbrains.kotlin:kotlin-test:${getKotlinPluginVersion()}")
             implementation(getCatalogLib("android.test.runner"))
           }
         }
       }
 
       is KotlinJvmProjectExtension -> {
-        dependencies.add("testImplementation", getCatalogLib("kotlin.test"))
+        dependencies.add("testImplementation", "org.jetbrains.kotlin:kotlin-test:${getKotlinPluginVersion()}")
       }
     }
   }

gradle/libraries.toml

@@ -126,8 +126,6 @@ kotlin-plugin-max = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plug
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect" } # use same version as apiVersion
 kotlin-stdlib-common = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-common" } # use same version as apiVersion
 kotlin-stdlib-jvm = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib" } # use same version as apiVersion
-kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test" } # use same version as apiVersion
-kotlin-test-js = { group = "org.jetbrains.kotlin", name = "kotlin-test-js" } # use same version as apiVersion
 kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit" } # use same version as apiVersion
 # Kotlin/JS has no apiVersion:
 # The Kotlin/JS standard library has an older version (2.0.20-release-360) than the compiler (2.1.0). Such a configuration is not supported.

libraries/apollo-ast/build.gradle.kts

@@ -29,7 +29,6 @@ kotlin {
     getByName("jvmTest") {
       dependencies {
         implementation(libs.google.testparameterinjector)
-        implementation(libs.kotlin.test)
       }
     }
   }

libraries/apollo-debug-server/build.gradle.kts

@@ -29,7 +29,6 @@ kotlin {
     }
     getByName("jvmTest") {
       dependencies {
-        implementation(libs.kotlin.test)
         implementation(project(":apollo-runtime"))
       }
     }

libraries/apollo-engine-tests/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.gradleup.librarian.core.tooling.init.kotlinPluginVersion
+
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
 }
@@ -12,8 +14,8 @@ kotlin {
     findByName("commonMain")?.apply {
       dependencies {
         api(project(":apollo-runtime"))
-        implementation(libs.kotlin.test)
         implementation(libs.apollo.mockserver)
+        implementation("org.jetbrains.kotlin:kotlin-test:$kotlinPluginVersion")
       }
     }
     findByName("commonTest")?.apply {

libraries/apollo-testing-support-internal/build.gradle.kts

@@ -18,13 +18,11 @@ kotlin {
     }
     findByName("jsMain")?.apply {
       dependencies {
-        implementation(libs.kotlin.test.js)
         api(libs.okio.nodefilesystem)
       }
     }
     findByName("jsTest")?.apply {
       dependencies {
-        implementation(libs.kotlin.test.js)
       }
     }
   }

libraries/apollo-testing-support/build.gradle.kts

@@ -28,13 +28,11 @@ kotlin {
 
     findByName("jsMain")?.apply {
       dependencies {
-        implementation(libs.kotlin.test.js)
         api(libs.okio.nodefilesystem)
       }
     }
     findByName("jsTest")?.apply {
       dependencies {
-        implementation(libs.kotlin.test.js)
       }
     }
   }

tests/cache-variables-arguments/build.gradle.kts

@@ -8,7 +8,6 @@ apolloTest()
 dependencies {
   implementation(libs.apollo.runtime)
   implementation(libs.apollo.normalizedcache)
-  testImplementation(libs.kotlin.test)
 }
 
 apollo {

tests/catch/build.gradle.kts

@@ -8,7 +8,6 @@ apolloTest()
 dependencies {
   implementation(libs.apollo.api)
   implementation(libs.apollo.testingsupport.internal)
-  testImplementation(libs.kotlin.test)
   testImplementation(libs.junit)
   testImplementation(libs.okhttp)
 }

tests/compiler-plugins/app/build.gradle.kts

@@ -11,7 +11,6 @@ apolloTest()
 
 dependencies {
   implementation(libs.apollo.runtime)
-  testImplementation(libs.kotlin.test)
   testImplementation(libs.junit)
   testImplementation(libs.kotlin.reflect)
 }