build: fixed dependencies on kotlin-test

slisson · slisson · commit 21633097d191 · 2023-09-05T09:22:30.000+02:00
diff --git a/light-model-client/build.gradle.kts b/light-model-client/build.gradle.kts
@@ -44,8 +44,7 @@ kotlin {
         val commonTest by getting {
             dependencies {
                 implementation(libs.kotlin.coroutines.test)
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
+                implementation(kotlin("test"))
             }
         }
         val jvmMain by getting {
@@ -55,7 +54,6 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("test"))
 
                 implementation(project(":authorization"))
 //                implementation(project(":model-client"))
@@ -81,7 +79,6 @@ kotlin {
         }
         val jsTest by getting {
             dependencies {
-                implementation(kotlin("test-js"))
                 implementation(npm("jsdom-global", "3.0.2"))
                 implementation(npm("jsdom", "20.0.2"))
             }
diff --git a/model-api-gen-gradle-test/build.gradle.kts b/model-api-gen-gradle-test/build.gradle.kts
@@ -46,8 +46,6 @@ dependencies {
     implementation("org.modelix:modelql-typed:$modelixCoreVersion")
     implementation("org.modelix:modelql-untyped:$modelixCoreVersion")
 
-    testImplementation(kotlin("test-common"))
-    testImplementation(kotlin("test-annotations-common"))
     testImplementation(kotlin("test"))
     testImplementation(kotlin("reflect"))
 
diff --git a/model-api-gen-runtime/build.gradle.kts b/model-api-gen-runtime/build.gradle.kts
@@ -35,8 +35,7 @@ kotlin {
         }
         val commonTest by getting {
             dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
+                implementation(kotlin("test"))
             }
         }
         val jvmMain by getting {
@@ -46,7 +45,6 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("test"))
             }
         }
         val jsMain by getting {
@@ -55,7 +53,6 @@ kotlin {
         }
         val jsTest by getting {
             dependencies {
-                implementation(kotlin("test-js"))
             }
         }
     }
diff --git a/model-api/build.gradle.kts b/model-api/build.gradle.kts
@@ -38,8 +38,7 @@ kotlin {
         }
         val commonTest by getting {
             dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
+                implementation(kotlin("test"))
             }
         }
         val jvmMain by getting {
@@ -50,7 +49,6 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("test"))
             }
         }
         val jsMain by getting {
@@ -63,7 +61,6 @@ kotlin {
         }
         val jsTest by getting {
             dependencies {
-                implementation(kotlin("test-js"))
             }
         }
     }
diff --git a/model-client/build.gradle.kts b/model-client/build.gradle.kts
@@ -42,7 +42,7 @@ kotlin {
                 api(project(":model-api"))
                 api(project(":model-datastructure"))
                 api(project(":model-server-api"))
-                kotlin("stdlib-common")
+                implementation(kotlin("stdlib-common"))
                 implementation(libs.kotlin.collections.immutable)
                 implementation(libs.kotlin.coroutines.core)
                 implementation(libs.kotlin.logging)
@@ -55,13 +55,12 @@ kotlin {
         }
         val commonTest by getting {
             dependencies {
-                kotlin("test-common")
-                kotlin("test-annotations-common")
+                implementation(kotlin("test"))
             }
         }
         val jvmMain by getting {
             dependencies {
-                kotlin("stdlib-jdk8")
+                implementation(kotlin("stdlib-jdk8"))
 
                 implementation(libs.vavr)
                 implementation(libs.apache.commons.lang)
@@ -83,7 +82,6 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("test"))
             }
         }
         val jsMain by getting {
@@ -96,7 +94,6 @@ kotlin {
         }
         val jsTest by getting {
             dependencies {
-                implementation(kotlin("test-js"))
             }
         }
     }
diff --git a/model-datastructure/build.gradle.kts b/model-datastructure/build.gradle.kts
@@ -35,8 +35,7 @@ kotlin {
         }
         val commonTest by getting {
             dependencies {
-                kotlin("test-common")
-                kotlin("test-annotations-common")
+                implementation(kotlin("test"))
             }
         }
         val jvmMain by getting {
@@ -63,7 +62,6 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("test"))
             }
         }
         val jsMain by getting {
@@ -77,7 +75,6 @@ kotlin {
         }
         val jsTest by getting {
             dependencies {
-                implementation(kotlin("test-js"))
             }
         }
     }
diff --git a/model-server-api/build.gradle.kts b/model-server-api/build.gradle.kts
@@ -38,8 +38,7 @@ kotlin {
         val commonTest by getting {
             dependencies {
 //                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutinesVersion")
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
+                implementation(kotlin("test"))
             }
         }
         val jvmMain by getting {
@@ -48,7 +47,6 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("test"))
             }
         }
         val jsMain by getting {
@@ -57,7 +55,6 @@ kotlin {
         }
         val jsTest by getting {
             dependencies {
-                implementation(kotlin("test-js"))
 //                implementation(npm("jsdom-global", "3.0.2"))
 //                implementation(npm("jsdom", "20.0.2"))
             }
diff --git a/modelql-client/build.gradle.kts b/modelql-client/build.gradle.kts
@@ -48,8 +48,7 @@ kotlin {
         val commonTest by getting {
             dependencies {
                 implementation(libs.kotlin.coroutines.test)
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
+                implementation(kotlin("test"))
             }
         }
         val jvmMain by getting {
@@ -59,7 +58,6 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("test"))
 
                 implementation(project(":model-client", configuration = "jvmRuntimeElements"))
                 implementation(project(":modelql-server"))
@@ -84,7 +82,6 @@ kotlin {
         }
         val jsTest by getting {
             dependencies {
-                implementation(kotlin("test-js"))
                 implementation(npm("jsdom-global", "3.0.2"))
                 implementation(npm("jsdom", "20.0.2"))
             }
diff --git a/modelql-core/build.gradle.kts b/modelql-core/build.gradle.kts
@@ -46,8 +46,7 @@ kotlin {
         val commonTest by getting {
             dependencies {
                 implementation(libs.kotlin.coroutines.test)
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
+                implementation(kotlin("test"))
             }
         }
         val jvmMain by getting {
@@ -56,7 +55,6 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("test"))
             }
         }
         val jsMain by getting {
@@ -65,7 +63,6 @@ kotlin {
         }
         val jsTest by getting {
             dependencies {
-                implementation(kotlin("test-js"))
             }
         }
     }
diff --git a/modelql-html/build.gradle.kts b/modelql-html/build.gradle.kts
@@ -42,8 +42,7 @@ kotlin {
         val commonTest by getting {
             dependencies {
                 implementation(libs.kotlin.coroutines.test)
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
+                implementation(kotlin("test"))
             }
         }
         val jvmMain by getting {
@@ -53,7 +52,6 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("test"))
             }
         }
         val jsMain by getting {
@@ -62,7 +60,6 @@ kotlin {
         }
         val jsTest by getting {
             dependencies {
-                implementation(kotlin("test-js"))
             }
         }
     }
diff --git a/modelql-typed/build.gradle.kts b/modelql-typed/build.gradle.kts
@@ -45,8 +45,7 @@ kotlin {
         }
         val commonTest by getting {
             dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
+                implementation(kotlin("test"))
             }
         }
         val jvmMain by getting {
@@ -55,7 +54,6 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("test"))
             }
         }
         val jsMain by getting {
@@ -64,7 +62,6 @@ kotlin {
         }
         val jsTest by getting {
             dependencies {
-                implementation(kotlin("test-js"))
             }
         }
     }
diff --git a/modelql-untyped/build.gradle.kts b/modelql-untyped/build.gradle.kts
@@ -43,8 +43,7 @@ kotlin {
         }
         val commonTest by getting {
             dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
+                implementation(kotlin("test"))
             }
         }
         val jvmMain by getting {
@@ -53,7 +52,6 @@ kotlin {
         }
         val jvmTest by getting {
             dependencies {
-                implementation(kotlin("test"))
             }
         }
         val jsMain by getting {
@@ -62,7 +60,6 @@ kotlin {
         }
         val jsTest by getting {
             dependencies {
-                implementation(kotlin("test-js"))
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ kotlin {`
`44`	`44`	`val commonTest by getting {`
`45`	`45`	`dependencies {`
`46`	`46`	`implementation(libs.kotlin.coroutines.test)`
`47`		`- implementation(kotlin("test-common"))`
`48`		`- implementation(kotlin("test-annotations-common"))`
	`47`	`+ implementation(kotlin("test"))`
`49`	`48`	`}`
`50`	`49`	`}`
`51`	`50`	`val jvmMain by getting {`
`@@ -55,7 +54,6 @@ kotlin {`
`55`	`54`	`}`
`56`	`55`	`val jvmTest by getting {`
`57`	`56`	`dependencies {`
`58`		`- implementation(kotlin("test"))`
`59`	`57`
`60`	`58`	`implementation(project(":authorization"))`
`61`	`59`	`// implementation(project(":model-client"))`
`@@ -81,7 +79,6 @@ kotlin {`
`81`	`79`	`}`
`82`	`80`	`val jsTest by getting {`
`83`	`81`	`dependencies {`
`84`		`- implementation(kotlin("test-js"))`
`85`	`82`	`implementation(npm("jsdom-global", "3.0.2"))`
`86`	`83`	`implementation(npm("jsdom", "20.0.2"))`
`87`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ kotlin {`
`35`	`35`	`}`
`36`	`36`	`val commonTest by getting {`
`37`	`37`	`dependencies {`
`38`		`- implementation(kotlin("test-common"))`
`39`		`- implementation(kotlin("test-annotations-common"))`
	`38`	`+ implementation(kotlin("test"))`
`40`	`39`	`}`
`41`	`40`	`}`
`42`	`41`	`val jvmMain by getting {`
`@@ -46,7 +45,6 @@ kotlin {`
`46`	`45`	`}`
`47`	`46`	`val jvmTest by getting {`
`48`	`47`	`dependencies {`
`49`		`- implementation(kotlin("test"))`
`50`	`48`	`}`
`51`	`49`	`}`
`52`	`50`	`val jsMain by getting {`
`@@ -55,7 +53,6 @@ kotlin {`
`55`	`53`	`}`
`56`	`54`	`val jsTest by getting {`
`57`	`55`	`dependencies {`
`58`		`- implementation(kotlin("test-js"))`
`59`	`56`	`}`
`60`	`57`	`}`
`61`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ kotlin {`
`38`	`38`	`}`
`39`	`39`	`val commonTest by getting {`
`40`	`40`	`dependencies {`
`41`		`- implementation(kotlin("test-common"))`
`42`		`- implementation(kotlin("test-annotations-common"))`
	`41`	`+ implementation(kotlin("test"))`
`43`	`42`	`}`
`44`	`43`	`}`
`45`	`44`	`val jvmMain by getting {`
`@@ -50,7 +49,6 @@ kotlin {`
`50`	`49`	`}`
`51`	`50`	`val jvmTest by getting {`
`52`	`51`	`dependencies {`
`53`		`- implementation(kotlin("test"))`
`54`	`52`	`}`
`55`	`53`	`}`
`56`	`54`	`val jsMain by getting {`
`@@ -63,7 +61,6 @@ kotlin {`
`63`	`61`	`}`
`64`	`62`	`val jsTest by getting {`
`65`	`63`	`dependencies {`
`66`		`- implementation(kotlin("test-js"))`
`67`	`64`	`}`
`68`	`65`	`}`
`69`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ kotlin {`
`42`	`42`	`api(project(":model-api"))`
`43`	`43`	`api(project(":model-datastructure"))`
`44`	`44`	`api(project(":model-server-api"))`
`45`		`- kotlin("stdlib-common")`
	`45`	`+ implementation(kotlin("stdlib-common"))`
`46`	`46`	`implementation(libs.kotlin.collections.immutable)`
`47`	`47`	`implementation(libs.kotlin.coroutines.core)`
`48`	`48`	`implementation(libs.kotlin.logging)`
`@@ -55,13 +55,12 @@ kotlin {`
`55`	`55`	`}`
`56`	`56`	`val commonTest by getting {`
`57`	`57`	`dependencies {`
`58`		`- kotlin("test-common")`
`59`		`- kotlin("test-annotations-common")`
	`58`	`+ implementation(kotlin("test"))`
`60`	`59`	`}`
`61`	`60`	`}`
`62`	`61`	`val jvmMain by getting {`
`63`	`62`	`dependencies {`
`64`		`- kotlin("stdlib-jdk8")`
	`63`	`+ implementation(kotlin("stdlib-jdk8"))`
`65`	`64`
`66`	`65`	`implementation(libs.vavr)`
`67`	`66`	`implementation(libs.apache.commons.lang)`
`@@ -83,7 +82,6 @@ kotlin {`
`83`	`82`	`}`
`84`	`83`	`val jvmTest by getting {`
`85`	`84`	`dependencies {`
`86`		`- implementation(kotlin("test"))`
`87`	`85`	`}`
`88`	`86`	`}`
`89`	`87`	`val jsMain by getting {`
`@@ -96,7 +94,6 @@ kotlin {`
`96`	`94`	`}`
`97`	`95`	`val jsTest by getting {`
`98`	`96`	`dependencies {`
`99`		`- implementation(kotlin("test-js"))`
`100`	`97`	`}`
`101`	`98`	`}`
`102`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ kotlin {`
`48`	`48`	`val commonTest by getting {`
`49`	`49`	`dependencies {`
`50`	`50`	`implementation(libs.kotlin.coroutines.test)`
`51`		`- implementation(kotlin("test-common"))`
`52`		`- implementation(kotlin("test-annotations-common"))`
	`51`	`+ implementation(kotlin("test"))`
`53`	`52`	`}`
`54`	`53`	`}`
`55`	`54`	`val jvmMain by getting {`
`@@ -59,7 +58,6 @@ kotlin {`
`59`	`58`	`}`
`60`	`59`	`val jvmTest by getting {`
`61`	`60`	`dependencies {`
`62`		`- implementation(kotlin("test"))`
`63`	`61`
`64`	`62`	`implementation(project(":model-client", configuration = "jvmRuntimeElements"))`
`65`	`63`	`implementation(project(":modelql-server"))`
`@@ -84,7 +82,6 @@ kotlin {`
`84`	`82`	`}`
`85`	`83`	`val jsTest by getting {`
`86`	`84`	`dependencies {`
`87`		`- implementation(kotlin("test-js"))`
`88`	`85`	`implementation(npm("jsdom-global", "3.0.2"))`
`89`	`86`	`implementation(npm("jsdom", "20.0.2"))`
`90`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,7 @@ kotlin {`
`46`	`46`	`val commonTest by getting {`
`47`	`47`	`dependencies {`
`48`	`48`	`implementation(libs.kotlin.coroutines.test)`
`49`		`- implementation(kotlin("test-common"))`
`50`		`- implementation(kotlin("test-annotations-common"))`
	`49`	`+ implementation(kotlin("test"))`
`51`	`50`	`}`
`52`	`51`	`}`
`53`	`52`	`val jvmMain by getting {`
`@@ -56,7 +55,6 @@ kotlin {`
`56`	`55`	`}`
`57`	`56`	`val jvmTest by getting {`
`58`	`57`	`dependencies {`
`59`		`- implementation(kotlin("test"))`
`60`	`58`	`}`
`61`	`59`	`}`
`62`	`60`	`val jsMain by getting {`
`@@ -65,7 +63,6 @@ kotlin {`
`65`	`63`	`}`
`66`	`64`	`val jsTest by getting {`
`67`	`65`	`dependencies {`
`68`		`- implementation(kotlin("test-js"))`
`69`	`66`	`}`
`70`	`67`	`}`
`71`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ kotlin {`
`42`	`42`	`val commonTest by getting {`
`43`	`43`	`dependencies {`
`44`	`44`	`implementation(libs.kotlin.coroutines.test)`
`45`		`- implementation(kotlin("test-common"))`
`46`		`- implementation(kotlin("test-annotations-common"))`
	`45`	`+ implementation(kotlin("test"))`
`47`	`46`	`}`
`48`	`47`	`}`
`49`	`48`	`val jvmMain by getting {`
`@@ -53,7 +52,6 @@ kotlin {`
`53`	`52`	`}`
`54`	`53`	`val jvmTest by getting {`
`55`	`54`	`dependencies {`
`56`		`- implementation(kotlin("test"))`
`57`	`55`	`}`
`58`	`56`	`}`
`59`	`57`	`val jsMain by getting {`
`@@ -62,7 +60,6 @@ kotlin {`
`62`	`60`	`}`
`63`	`61`	`val jsTest by getting {`
`64`	`62`	`dependencies {`
`65`		`- implementation(kotlin("test-js"))`
`66`	`63`	`}`
`67`	`64`	`}`
`68`	`65`	`}`