From 357d12fc8e09a01b34e8dc2fee7e66880e7a962c Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Wed, 16 Aug 2023 15:15:22 +0200 Subject: [PATCH] [Build] Move JUnit dependencies into the version catalog The `kotlin-test` dependencies are left untouched as changing them affects publications, thus these versions are independent from the used inside our build #KTI-1349 In Progress --- build-common/build.gradle.kts | 2 +- compiler/android-tests/build.gradle.kts | 6 +-- compiler/build.gradle.kts | 2 +- compiler/cli/build.gradle.kts | 2 +- compiler/container/build.gradle.kts | 2 +- compiler/daemon/daemon-tests/build.gradle.kts | 2 +- .../legacy-fir-tests/build.gradle.kts | 2 +- .../fir/modularized-tests/build.gradle.kts | 2 +- .../raw-fir/light-tree2fir/build.gradle.kts | 2 +- compiler/fir/raw-fir/psi2fir/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- compiler/tests-common/build.gradle.kts | 2 +- compiler/util-io/build.gradle.kts | 2 +- compiler/util-klib/build.gradle.kts | 2 +- generators/test-generator/build.gradle.kts | 2 +- gradle/libs.versions.toml | 12 +++++ gradle/versions.properties | 3 +- jps/jps-common/build.gradle.kts | 2 +- js/js.tests/build.gradle.kts | 4 +- .../backend.native/tests/build.gradle | 2 +- kotlin-native/build-tools/settings.gradle.kts | 8 +++ kotlin-native/klib/build.gradle | 2 +- .../build.gradle.kts | 2 +- .../jvm-embeddable-host/build.gradle.kts | 2 +- .../jvm-maven-deps/host/build.gradle.kts | 2 +- .../jvm-simple-script/host/build.gradle.kts | 2 +- .../kotlinx-metadata/jvm/build.gradle.kts | 2 +- libraries/scripting/common/build.gradle.kts | 2 +- .../dependencies-maven-all/build.gradle.kts | 2 +- .../dependencies-maven/build.gradle.kts | 2 +- .../scripting/dependencies/build.gradle.kts | 2 +- .../scripting/jsr223-test/build.gradle.kts | 4 +- .../scripting/jvm-host-test/build.gradle.kts | 2 +- libraries/scripting/jvm/build.gradle.kts | 2 +- .../tools/kotlin-assignment/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../kotlin-gradle-plugin/build.gradle.kts | 2 +- .../kotlin-gradle-statistics/build.gradle.kts | 2 +- .../kotlin-main-kts-test/build.gradle.kts | 2 +- libraries/tools/kotlin-noarg/build.gradle.kts | 2 +- .../kotlin-sam-with-receiver/build.gradle.kts | 2 +- .../tools/kotlin-script-util/build.gradle.kts | 4 +- libraries/tools/kotlinp/build.gradle.kts | 2 +- native/commonizer-api/build.gradle.kts | 2 +- native/commonizer/build.gradle.kts | 2 +- native/utils/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- plugins/assign-plugin/build.gradle.kts | 2 +- .../atomicfu-compiler/build.gradle.kts | 4 +- plugins/jvm-abi-gen/build.gradle.kts | 2 +- plugins/lombok/build.gradle.kts | 2 +- .../parcelize-compiler/build.gradle.kts | 2 +- .../pill/generate-all-tests/build.gradle.kts | 4 +- plugins/sam-with-receiver/build.gradle.kts | 2 +- .../scripting-compiler-impl/build.gradle.kts | 2 +- .../scripting-compiler/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- prepare/compiler-embeddable/build.gradle.kts | 2 +- .../src/main/kotlin/repoDependencies.kt | 53 ++++++++++++------- wasm/wasm.ir/build.gradle.kts | 2 +- wasm/wasm.tests/build.gradle.kts | 2 +- 62 files changed, 120 insertions(+), 86 deletions(-) diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index 8782e30f16c..bf90e5c760d 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { testCompileOnly(project(":compiler:cli-common")) testApi(projectTests(":compiler:tests-common")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testApi(protobufFull()) testApi(kotlinStdlib()) testImplementation(project(":compiler:build-tools:kotlin-build-statistics")) diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index ed2b4de3377..df4a1104065 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -17,21 +17,19 @@ dependencies { testApi(kotlinStdlib()) testApi(projectTests(":compiler:tests-common")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:tests-compiler-utils")) testApi(projectTests(":compiler:tests-common-new")) - testApi(commonDependency("junit:junit")) - testApi(jpsModel()) testApi(jpsBuildTest()) testRuntimeOnly(intellijCore()) testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.jna:jna")) - testApi("org.junit.platform:junit-platform-launcher:${commonDependencyVersion("org.junit.platform", "")}") + testApi(libs.junit.platform.launcher) } sourceSets { diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index d8c37381327..071e5795e4f 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { testApi(kotlinStdlib()) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) testCompileOnly(project(":kotlin-test:kotlin-test-junit")) testApi(projectTests(":compiler:tests-common")) diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index cd74d4ec624..086947a6534 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { testApi(project(":compiler:backend")) testApi(project(":compiler:cli")) testApi(projectTests(":compiler:tests-common")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) } sourceSets { diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts index f8b57240fcd..16b4cc366f4 100644 --- a/compiler/container/build.gradle.kts +++ b/compiler/container/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { testCompileOnly("org.jetbrains:annotations:13.0") testApi(project(":kotlin-test:kotlin-test-jvm")) testApi(project(":kotlin-test:kotlin-test-junit")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testCompileOnly(intellijCore()) testRuntimeOnly(intellijCore()) diff --git a/compiler/daemon/daemon-tests/build.gradle.kts b/compiler/daemon/daemon-tests/build.gradle.kts index 6957f22a99f..01e034ce547 100644 --- a/compiler/daemon/daemon-tests/build.gradle.kts +++ b/compiler/daemon/daemon-tests/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { testImplementation(project(":kotlin-test:kotlin-test-jvm")) testImplementation(project(":kotlin-daemon")) testImplementation(project(":kotlin-daemon-client")) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(projectTests(":compiler:tests-common")) testImplementation(intellijCore()) } diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts b/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts index 62451830821..58a555c7e40 100644 --- a/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts +++ b/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts @@ -13,7 +13,7 @@ plugins { dependencies { compileOnly(intellijCore()) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) testCompileOnly(project(":kotlin-test:kotlin-test-junit")) testApi(projectTests(":compiler:tests-common")) diff --git a/compiler/fir/modularized-tests/build.gradle.kts b/compiler/fir/modularized-tests/build.gradle.kts index 7aa4bdca3fb..cf3c53f814f 100644 --- a/compiler/fir/modularized-tests/build.gradle.kts +++ b/compiler/fir/modularized-tests/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { testRuntimeOnly("xerces:xercesImpl:2.12.0") testRuntimeOnly(commonDependency("commons-lang:commons-lang")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) testCompileOnly(project(":kotlin-test:kotlin-test-junit")) testApi(projectTests(":compiler:tests-common")) diff --git a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts index 16ac8804e3c..13b5bf28033 100644 --- a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { compileOnly(intellijCore()) compileOnly(libs.guava) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(projectTests(":compiler:tests-common")) testImplementation(projectTests(":compiler:fir:raw-fir:psi2fir")) diff --git a/compiler/fir/raw-fir/psi2fir/build.gradle.kts b/compiler/fir/raw-fir/psi2fir/build.gradle.kts index e67d80c64a7..b835664cc8d 100644 --- a/compiler/fir/raw-fir/psi2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/psi2fir/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { compileOnly(intellijCore()) compileOnly(libs.guava) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(projectTests(":compiler:tests-common")) testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts index 2211cd8635b..0e1f66d1838 100644 --- a/compiler/incremental-compilation-impl/build.gradle.kts +++ b/compiler/incremental-compilation-impl/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { api(project(":compiler:build-tools:kotlin-build-tools-api")) compileOnly(intellijCore()) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testApi(project(":kotlin-test:kotlin-test-junit")) testApi(kotlinStdlib()) testApi(projectTests(":kotlin-build-common")) diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 8e5052d9a49..f0d6f02b173 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -53,7 +53,7 @@ dependencies { testApi(project(":kotlin-test:kotlin-test-jvm")) testApi(project(":kotlin-scripting-compiler-impl")) testApi(projectTests(":compiler:test-infrastructure-utils")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testApi(commonDependency("com.android.tools:r8")) testApi(project(":analysis:analysis-internal-utils")) testCompileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } diff --git a/compiler/util-io/build.gradle.kts b/compiler/util-io/build.gradle.kts index 4e600cdcae6..2702ab51d7d 100644 --- a/compiler/util-io/build.gradle.kts +++ b/compiler/util-io/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { implementation(kotlinStdlib()) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(kotlin("test")) } diff --git a/compiler/util-klib/build.gradle.kts b/compiler/util-klib/build.gradle.kts index 96b04ec541c..0c2a1c9e0e2 100644 --- a/compiler/util-klib/build.gradle.kts +++ b/compiler/util-klib/build.gradle.kts @@ -10,7 +10,7 @@ description = "Common klib reader and writer" dependencies { api(kotlinStdlib()) api(project(":kotlin-util-io")) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) } sourceSets { diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts index 20b23214318..1c10018b1ac 100644 --- a/generators/test-generator/build.gradle.kts +++ b/generators/test-generator/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { testApi(project(":core:util.runtime")) testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(kotlinStdlib()) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testApiJUnit5() testApi(project(":generators")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 25a3c13105b..8aebb4ce39d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,6 +19,9 @@ gson = { strictly = "2.8.9" } # should be in sync with version.properties jetbrains-ideaExt = "1.0.1" jackson = "2.15.2" jgit = "6.6.0.202305301015-r" +junit4 = "4.13.2" +junit5 = "5.9.1" +junit-platform = "1.7.0" [libraries] dexMemberList = { module = "com.jakewharton.dex:dex-member-list", version.ref = "dexMemberList" } @@ -50,6 +53,15 @@ guava = { module = "com.google.guava:guava", version.ref = "guava" } jetbrains-ideaExt-gradlePlugin = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext", version.ref = "jetbrains-ideaExt" } jdom2 = { module = "org.jdom:jdom2", version.ref = "jdom2" } jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" } +junit4 = { module = "junit:junit", version.ref = "junit4" } +junit-bom = { module = "org.junit:junit-bom", version.ref = "junit5" } +junit-jupyter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" } +junit-jupyter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" } +junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit5" } +junit-platform-commons = { module = "org.junit.platform:junit-platform-commons", version.ref = "junit-platform" } +junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" } +junit-platform-runner = { module = "org.junit.platform:junit-platform-runner", version.ref = "junit-platform" } +junit-platform-suite-api = { module = "org.junit.platform:junit-platform-suite-api", version.ref = "junit-platform" } [plugins] jetbrains-ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "jetbrains-ideaExt" } diff --git a/gradle/versions.properties b/gradle/versions.properties index 41177df90c5..12f42bed127 100644 --- a/gradle/versions.properties +++ b/gradle/versions.properties @@ -15,10 +15,10 @@ versions.intellij-deps-fastutil=8.5.4-9 versions.jdom=2.0.6 versions.jna-platform=5.9.0.26 versions.jna=5.9.0.26 +# junit-bom still required yet for compose versions.junit-bom=5.9.1 versions.log4j=1.2.17.2 versions.lz4-java=1.7.1 -versions.org.junit.platform=1.7.0 versions.oro=2.0.8 versions.serviceMessages=2019.1.4 versions.stax2-api=4.2.1 @@ -34,6 +34,7 @@ versions.javax.inject=1 versions.jflex=1.7.0 versions.jline=3.3.1 versions.jsr305=1.3.9 +# junit still required yet for compose versions.junit=4.13.2 # kotlin-reflect has version which is bundled in minimally supported IDEA versions.kotlin-reflect=1.6.10 diff --git a/jps/jps-common/build.gradle.kts b/jps/jps-common/build.gradle.kts index d31faaf8cef..fe0ba5cd2f3 100644 --- a/jps/jps-common/build.gradle.kts +++ b/jps/jps-common/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { testImplementation(project(":compiler:cli-common")) testImplementation(jpsModelSerialization()) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(kotlin("test-junit")) } diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 79f46bfd2df..3ab6f841e83 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { testApi(project(":js:js.dce")) testApi(project(":js:js.engines")) testApi(project(":compiler:incremental-compilation-impl")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testApi(projectTests(":kotlin-build-common")) testApi(projectTests(":generators:test-generator")) @@ -79,7 +79,7 @@ dependencies { antLauncherJar(commonDependency("org.apache.ant", "ant")) antLauncherJar(toolsJar()) - testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${commonDependencyVersion("org.junit", "junit-bom")}") + testRuntimeOnly(libs.junit.vintage.engine) testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-serialization-json")) testImplementation(libs.ktor.client.cio) diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index e50a4666285..6618ded4b60 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -6243,7 +6243,7 @@ dependencies { implementation kotlinCompilerModule api project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements') - api RepoDependencies.commonDependency(project, "junit") + api libs.junit4 } project.afterEvaluate { diff --git a/kotlin-native/build-tools/settings.gradle.kts b/kotlin-native/build-tools/settings.gradle.kts index 3dace58b62e..fabeea7484a 100644 --- a/kotlin-native/build-tools/settings.gradle.kts +++ b/kotlin-native/build-tools/settings.gradle.kts @@ -19,6 +19,14 @@ plugins { id("kotlin-daemon-config") } +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../../gradle/libs.versions.toml")) + } + } +} + buildscript { val buildGradlePluginVersion = extra["kotlin.build.gradlePlugin.version"] dependencies { diff --git a/kotlin-native/klib/build.gradle b/kotlin-native/klib/build.gradle index 9212a7b2ba2..ef8efd1ffdb 100644 --- a/kotlin-native/klib/build.gradle +++ b/kotlin-native/klib/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation project(":kotlin-stdlib") implementation project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements') implementation project(":kotlin-native:utilities:basic-utils") - testImplementation RepoDependencies.commonDependency(project, "junit") + testImplementation libs.junit4 testImplementation project(":kotlin-test:kotlin-test-junit") } diff --git a/kotlin-native/prepare/kotlin-native-embeddable-compiler/build.gradle.kts b/kotlin-native/prepare/kotlin-native-embeddable-compiler/build.gradle.kts index 0e250c99279..27a9e5773e9 100644 --- a/kotlin-native/prepare/kotlin-native-embeddable-compiler/build.gradle.kts +++ b/kotlin-native/prepare/kotlin-native-embeddable-compiler/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { kotlinNativeEmbedded(project(":kotlin-native:klib")) kotlinNativeEmbedded(project(":kotlin-native:endorsedLibraries:kotlinx.cli", "jvmRuntimeElements")) kotlinNativeEmbedded(project(":kotlin-compiler")) { isTransitive = false } - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(project(":kotlin-test:kotlin-test-junit")) } diff --git a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts index 83a92b898cf..eeef702211b 100644 --- a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable")) testRuntimeOnly(project(":kotlin-scripting-jvm-host")) testRuntimeOnly(libs.guava) - testApi(commonDependency("junit")) + testApi(libs.junit4) } sourceSets { diff --git a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts index a9fb8d590e5..3d1e2e6b9af 100644 --- a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { testRuntimeOnly(project(":kotlin-compiler")) testRuntimeOnly(project(":kotlin-scripting-compiler")) - testApi(commonDependency("junit")) + testApi(libs.junit4) } sourceSets { diff --git a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts index 4ea150c9fe0..9cd17251264 100644 --- a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { api(project(":kotlin-scripting-jvm-host-unshaded")) testRuntimeOnly(project(":kotlin-compiler")) testRuntimeOnly(project(":kotlin-scripting-compiler")) - testApi(commonDependency("junit")) + testApi(libs.junit4) } sourceSets { diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts index 97ec7da176d..63e301cbf3e 100644 --- a/libraries/kotlinx-metadata/jvm/build.gradle.kts +++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { embedded(project(":core:metadata.jvm")) embedded(protobufLite()) testImplementation(project(":kotlin-test:kotlin-test-junit")) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all")) testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } } diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts index ddabe603dfb..b549dad0291 100644 --- a/libraries/scripting/common/build.gradle.kts +++ b/libraries/scripting/common/build.gradle.kts @@ -8,7 +8,7 @@ project.updateJvmTarget("1.8") dependencies { api(kotlinStdlib()) compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } - testApi(commonDependency("junit")) + testApi(libs.junit4) } sourceSets { diff --git a/libraries/scripting/dependencies-maven-all/build.gradle.kts b/libraries/scripting/dependencies-maven-all/build.gradle.kts index 3e09668fb92..919eae74d38 100644 --- a/libraries/scripting/dependencies-maven-all/build.gradle.kts +++ b/libraries/scripting/dependencies-maven-all/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { embedded("org.apache.maven.wagon:wagon-http:3.5.3") embedded("commons-io:commons-io:2.11.0") - testImplementation(commonDependency("junit")) + testImplementation(libs.junit4) testRuntimeOnly("org.slf4j:slf4j-nop:1.7.36") testImplementation(project(":kotlin-scripting-dependencies-maven-all")) } diff --git a/libraries/scripting/dependencies-maven/build.gradle.kts b/libraries/scripting/dependencies-maven/build.gradle.kts index 37bff5d7bdb..8e1baddbd91 100644 --- a/libraries/scripting/dependencies-maven/build.gradle.kts +++ b/libraries/scripting/dependencies-maven/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { implementation("commons-io:commons-io:2.11.0") testImplementation(projectTests(":kotlin-scripting-dependencies")) - testImplementation(commonDependency("junit")) + testImplementation(libs.junit4) testRuntimeOnly("org.slf4j:slf4j-nop:1.7.36") testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) diff --git a/libraries/scripting/dependencies/build.gradle.kts b/libraries/scripting/dependencies/build.gradle.kts index 4872f3dfb8b..b73d827cdd1 100644 --- a/libraries/scripting/dependencies/build.gradle.kts +++ b/libraries/scripting/dependencies/build.gradle.kts @@ -8,7 +8,7 @@ project.updateJvmTarget("1.8") dependencies { api(kotlinStdlib()) api(project(":kotlin-scripting-common")) - testApi(commonDependency("junit")) + testApi(libs.junit4) testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) } diff --git a/libraries/scripting/jsr223-test/build.gradle.kts b/libraries/scripting/jsr223-test/build.gradle.kts index 918f876c6e8..598009c1ec7 100644 --- a/libraries/scripting/jsr223-test/build.gradle.kts +++ b/libraries/scripting/jsr223-test/build.gradle.kts @@ -17,7 +17,7 @@ val testJsr223Runtime by configurations.creating { val testCompilationClasspath by configurations.creating dependencies { - testApi(commonDependency("junit")) + testApi(libs.junit4) testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded")) testCompileOnly(project(":compiler:cli")) testCompileOnly(project(":core:util.runtime")) @@ -28,7 +28,7 @@ dependencies { testRuntimeOnly(project(":kotlin-scripting-jsr223-unshaded")) testRuntimeOnly(project(":kotlin-compiler")) - embeddableTestRuntime(commonDependency("junit")) + embeddableTestRuntime(libs.junit4) embeddableTestRuntime(project(":kotlin-scripting-jsr223")) embeddableTestRuntime(project(":kotlin-scripting-compiler-embeddable")) embeddableTestRuntime(testSourceSet.output) diff --git a/libraries/scripting/jvm-host-test/build.gradle.kts b/libraries/scripting/jvm-host-test/build.gradle.kts index fabd1162466..7bea1e2c7e3 100644 --- a/libraries/scripting/jvm-host-test/build.gradle.kts +++ b/libraries/scripting/jvm-host-test/build.gradle.kts @@ -11,7 +11,7 @@ val embeddableTestRuntime by configurations.creating { } dependencies { - allTestsRuntime(commonDependency("junit")) + allTestsRuntime(libs.junit4) allTestsRuntime(intellijCore()) testApi(project(":kotlin-scripting-jvm-host-unshaded")) testApi(projectTests(":compiler:tests-common")) diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts index 16dbce99340..e5b63f5fadf 100644 --- a/libraries/scripting/jvm/build.gradle.kts +++ b/libraries/scripting/jvm/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { api(project(":kotlin-script-runtime")) api(kotlinStdlib()) api(project(":kotlin-scripting-common")) - testApi(commonDependency("junit")) + testApi(libs.junit4) } sourceSets { diff --git a/libraries/tools/kotlin-assignment/build.gradle.kts b/libraries/tools/kotlin-assignment/build.gradle.kts index 0130d574846..f1caacf82e4 100644 --- a/libraries/tools/kotlin-assignment/build.gradle.kts +++ b/libraries/tools/kotlin-assignment/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { commonCompileOnly(project(":compiler")) commonCompileOnly(project(":kotlin-assignment-compiler-plugin")) - testImplementation(commonDependency("junit")) + testImplementation(libs.junit4) } gradlePlugin { diff --git a/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts b/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts index e38a14cd898..f761a650ad7 100644 --- a/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { compileOnly(kotlinStdlib()) testImplementation(project(":kotlin-test:kotlin-test-junit")) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) } projectTest { diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 46eb5eb93b3..9cae4f1526a 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -141,7 +141,7 @@ dependencies { testImplementation(projectTests(":kotlin-build-common")) testImplementation(project(":kotlin-compiler-runner")) testImplementation(project(":kotlin-test:kotlin-test-junit")) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(project(":kotlin-gradle-statistics")) testImplementation(project(":kotlin-tooling-metadata")) } diff --git a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts index 7ebcba54ec3..f761a650ad7 100644 --- a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { compileOnly(kotlinStdlib()) testImplementation(project(":kotlin-test:kotlin-test-junit")) - testImplementation(commonDependency("junit")) + testImplementation(libs.junit4) } projectTest { diff --git a/libraries/tools/kotlin-main-kts-test/build.gradle.kts b/libraries/tools/kotlin-main-kts-test/build.gradle.kts index 19db3fee74b..a24c6551406 100644 --- a/libraries/tools/kotlin-main-kts-test/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts-test/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { testCompileOnly(project(":compiler:cli")) testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded")) testApi(kotlinStdlib("jdk8")) - testApi(commonDependency("junit")) + testApi(libs.junit4) testApi(projectTests(":kotlin-scripting-compiler")) { isTransitive = false } testImplementation(project(":kotlin-compiler-embeddable")) kotlinxSerializationGradlePluginClasspath(project(":kotlinx-serialization-compiler-plugin.embeddable")) { isTransitive = false } diff --git a/libraries/tools/kotlin-noarg/build.gradle.kts b/libraries/tools/kotlin-noarg/build.gradle.kts index 59b9c34942f..2f559f4d248 100644 --- a/libraries/tools/kotlin-noarg/build.gradle.kts +++ b/libraries/tools/kotlin-noarg/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { commonCompileOnly(project(":kotlin-noarg-compiler-plugin")) testImplementation(gradleApi()) - testImplementation(commonDependency("junit")) + testImplementation(libs.junit4) } gradlePlugin { diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts b/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts index 66fb3a380cf..cd5783090a7 100644 --- a/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts +++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { commonCompileOnly(project(":compiler")) commonCompileOnly(project(":kotlin-sam-with-receiver-compiler-plugin")) - testImplementation(commonDependency("junit")) + testImplementation(libs.junit4) } gradlePlugin { diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index c34a5f16062..1b61b31f082 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { api(project(":kotlin-daemon-client")) testCompileOnly(project(":compiler:cli")) testApi(project(":kotlin-test:kotlin-test-junit")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testApi(project(":kotlin-scripting-compiler")) testRuntimeOnly(project(":kotlin-compiler")) testApi(intellijCore()) @@ -27,7 +27,7 @@ optInToExperimentalCompilerApi() configurations.all { resolutionStrategy { - force(commonDependency("junit:junit")) + force(libs.junit4) } } diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts index ea2181af350..e125da7682b 100644 --- a/libraries/tools/kotlinp/build.gradle.kts +++ b/libraries/tools/kotlinp/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { testCompileOnly(project(":kotlinx-metadata")) testCompileOnly(project(":kotlinx-metadata-jvm")) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(projectTests(":compiler:tests-common")) testImplementation(projectTests(":generators:test-generator")) diff --git a/native/commonizer-api/build.gradle.kts b/native/commonizer-api/build.gradle.kts index 1d4b96a6d2c..d6b85b54feb 100644 --- a/native/commonizer-api/build.gradle.kts +++ b/native/commonizer-api/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { implementation(kotlinStdlib()) implementation(project(":native:kotlin-native-utils")) testImplementation(project(":kotlin-test::kotlin-test-junit")) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(projectTests(":compiler:tests-common")) testRuntimeOnly(project(":native:kotlin-klib-commonizer")) testImplementation(project(":kotlin-gradle-plugin")) diff --git a/native/commonizer/build.gradle.kts b/native/commonizer/build.gradle.kts index 9aa88c2770b..07647996c28 100644 --- a/native/commonizer/build.gradle.kts +++ b/native/commonizer/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { api(kotlinStdlib()) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(projectTests(":compiler:tests-common")) testImplementation(project(":kotlinx-metadata-klib")) { isTransitive = false } testImplementation(project(":kotlinx-metadata")) { isTransitive = false } diff --git a/native/utils/build.gradle.kts b/native/utils/build.gradle.kts index 2d34b75a4cf..fe5867dae88 100644 --- a/native/utils/build.gradle.kts +++ b/native/utils/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { api(project(":kotlin-util-klib")) api(platform(project(":kotlin-gradle-plugins-bom"))) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(kotlinStdlib()) testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testApiJUnit5() diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index 1b14dddb1b1..bf301db08e2 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { testApi(project(":kotlin-android-extensions-runtime")) testApi(projectTests(":compiler:tests-common")) testApi(project(":kotlin-test:kotlin-test-jvm")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) robolectricDependency("org.robolectric:android-all:5.0.2_r3-robolectric-r0") diff --git a/plugins/assign-plugin/build.gradle.kts b/plugins/assign-plugin/build.gradle.kts index 78e3b4e2d77..3e94372b9eb 100644 --- a/plugins/assign-plugin/build.gradle.kts +++ b/plugins/assign-plugin/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { testApi(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":compiler:tests-common")) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testCompileOnly(project(":kotlin-reflect-api")) testRuntimeOnly(project(":kotlin-reflect")) diff --git a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts index 05d833d4396..58163887890 100644 --- a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts +++ b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts @@ -83,7 +83,7 @@ dependencies { testImplementation(projectTests(":generators:test-generator")) testImplementation(projectTests(":js:js.tests")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testApi(project(":kotlin-test:kotlin-test-jvm")) // Dependencies for Kotlin/Native test infra: @@ -147,7 +147,7 @@ dependencies { testImplementation("org.jetbrains.kotlinx:atomicfu:0.21.0") - testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.1") + testRuntimeOnly(libs.junit.vintage.engine) } optInToExperimentalCompilerApi() diff --git a/plugins/jvm-abi-gen/build.gradle.kts b/plugins/jvm-abi-gen/build.gradle.kts index 4734c4f47ce..e772c190ef1 100644 --- a/plugins/jvm-abi-gen/build.gradle.kts +++ b/plugins/jvm-abi-gen/build.gradle.kts @@ -40,7 +40,7 @@ dependencies { compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testImplementation(projectTests(":compiler:tests-common")) testImplementation(projectTests(":compiler:incremental-compilation-impl")) } diff --git a/plugins/lombok/build.gradle.kts b/plugins/lombok/build.gradle.kts index a2a5d1b62ec..819520203eb 100644 --- a/plugins/lombok/build.gradle.kts +++ b/plugins/lombok/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { testRuntimeOnly(project(":core:descriptors.runtime")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testRuntimeOnly(libs.guava) testRuntimeOnly(commonDependency("org.codehaus.woodstox:stax2-api")) diff --git a/plugins/parcelize/parcelize-compiler/build.gradle.kts b/plugins/parcelize/parcelize-compiler/build.gradle.kts index d0736a88efc..5dff6628128 100644 --- a/plugins/parcelize/parcelize-compiler/build.gradle.kts +++ b/plugins/parcelize/parcelize-compiler/build.gradle.kts @@ -53,7 +53,7 @@ dependencies { testRuntimeOnly(commonDependency("com.fasterxml:aalto-xml")) testRuntimeOnly("com.jetbrains.intellij.platform:util-xml-dom:$intellijVersion") { isTransitive = false } - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) robolectricDependency("org.robolectric:android-all:5.0.2_r3-robolectric-r0") diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts index 2e11aba497c..ef771eee756 100644 --- a/plugins/pill/generate-all-tests/build.gradle.kts +++ b/plugins/pill/generate-all-tests/build.gradle.kts @@ -24,8 +24,8 @@ dependencies { } testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) - testRuntimeOnly(platform(commonDependency("org.junit:junit-bom"))) - testRuntimeOnly("org.junit.jupiter:junit-jupiter") + testRuntimeOnly(platform(libs.junit.bom)) + testRuntimeOnly(libs.junit.jupyter) if (kotlinBuildProperties.isInJpsBuildIdeaSync) { testRuntimeOnly(project(":core:descriptors.runtime")) diff --git a/plugins/sam-with-receiver/build.gradle.kts b/plugins/sam-with-receiver/build.gradle.kts index a8b7bc83cd2..e020fb91a58 100644 --- a/plugins/sam-with-receiver/build.gradle.kts +++ b/plugins/sam-with-receiver/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { testApi(projectTests(":compiler:test-infrastructure-utils")) testImplementation(projectTests(":compiler:tests-common")) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testRuntimeOnly(project(":core:descriptors.runtime")) testRuntimeOnly(project(":compiler:fir:fir-serialization")) diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts index b8896c881c3..ed5018f49e3 100644 --- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testApi(project(":compiler:cli-common")) testApi(project(":compiler:frontend.java")) testApi(projectTests(":compiler:tests-common")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) } sourceSets { diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts index f7501fd7460..84bc6e8c845 100644 --- a/plugins/scripting/scripting-compiler/build.gradle.kts +++ b/plugins/scripting/scripting-compiler/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testApi(project(":compiler:cli-common")) testApi(project(":compiler:frontend.java")) testApi(projectTests(":compiler:tests-common")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testImplementation(intellijCore()) testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) diff --git a/plugins/scripting/scripting-ide-services-test/build.gradle.kts b/plugins/scripting/scripting-ide-services-test/build.gradle.kts index 88533865f2f..5efb85d3aaa 100644 --- a/plugins/scripting/scripting-ide-services-test/build.gradle.kts +++ b/plugins/scripting/scripting-ide-services-test/build.gradle.kts @@ -19,7 +19,7 @@ val embeddableTestRuntime by configurations.creating { } dependencies { - allTestsRuntime(commonDependency("junit")) + allTestsRuntime(libs.junit4) testApi(kotlinStdlib("jdk8")) testApi(project(":kotlin-scripting-ide-services-unshaded")) testApi(project(":kotlin-scripting-compiler")) diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts index 53cc5c55e90..06b2ecfa8f6 100644 --- a/prepare/compiler-client-embeddable/build.gradle.kts +++ b/prepare/compiler-client-embeddable/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { testApi(project(":compiler:cli-common")) testApi(project(":daemon-common")) testApi(project(":kotlin-daemon-client")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testApi(project(":kotlin-test:kotlin-test-jvm")) testApi(project(":kotlin-test:kotlin-test-junit")) testCompilerClasspath(project(":kotlin-compiler")) diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts index 3b16a60677a..4efc5e3f43f 100644 --- a/prepare/compiler-embeddable/build.gradle.kts +++ b/prepare/compiler-embeddable/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { runtimeOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } runtimeOnly(project(":kotlin-daemon-embeddable")) runtimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j")) - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testApi(project(":kotlin-test:kotlin-test-junit")) testCompilationClasspath(kotlinStdlib()) } diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt index 7f0d8d8fbd1..3d7b891e622 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt @@ -14,12 +14,15 @@ import org.gradle.api.file.FileCollection import org.gradle.internal.jvm.Jvm import org.gradle.kotlin.dsl.closureOf import org.gradle.kotlin.dsl.extra +import org.gradle.kotlin.dsl.getByType import org.gradle.kotlin.dsl.project import java.io.File private val Project.isEAPIntellij get() = rootProject.extra["versions.intellijSdk"].toString().contains("-EAP-") private val Project.isNightlyIntellij get() = rootProject.extra["versions.intellijSdk"].toString().endsWith("SNAPSHOT") && !isEAPIntellij +private val Project.libsVersionCatalog get() = extensions.getByType().named("libs") + val Project.intellijRepo get() = when { @@ -197,39 +200,43 @@ fun Project.testApiJUnit5( jupiterParams: Boolean = false ) { with(dependencies) { - val platformVersion = commonDependencyVersion("org.junit", "junit-bom") - testApi(platform("org.junit:junit-bom:$platformVersion")) - testApi("org.junit.jupiter:junit-jupiter") + val libsVersionCatalog = libsVersionCatalog + testApi(platform(libsVersionCatalog.findLibrary("junit-bom").orElseThrow { GradleException("No version for `junit-bom`") })) + testApi(libsVersionCatalog.findLibrary("junit-jupyter").orElseThrow { GradleException("No version for `junit-jupyter`") }) if (vintageEngine) { - testApi("org.junit.vintage:junit-vintage-engine:$platformVersion") + testRuntimeOnly( + libsVersionCatalog.findLibrary("junit-vintage-engine") + .orElseThrow { GradleException("No version for `junit-vintage-engine`") }) } if (jupiterParams) { - testApi("org.junit.jupiter:junit-jupiter-params:$platformVersion") + testApi( + libsVersionCatalog.findLibrary("junit-jupyter-params") + .orElseThrow { GradleException("No version for `junit-jupyter-params`") }) } - val componentsVersion = commonDependencyVersion("org.junit.platform", "") - - val components = mutableListOf( - "org.junit.platform:junit-platform-commons", - "org.junit.platform:junit-platform-launcher" - ) + testApi( + libsVersionCatalog.findLibrary("junit-platform-commons") + .orElseThrow { GradleException("No version for `junit-platform-commons`") }) + testApi( + libsVersionCatalog.findLibrary("junit-platform-launcher") + .orElseThrow { GradleException("No version for `junit-platform-launcher`") }) if (runner) { - components += "org.junit.platform:junit-platform-runner" + testApi( + libsVersionCatalog.findLibrary("junit-platform-runner") + .orElseThrow { GradleException("No version for `junit-platform-runner`") }) } if (suiteApi) { - components += "org.junit.platform:junit-platform-suite-api" - } - - for (component in components) { - testApi("$component:$componentsVersion") + testApi( + libsVersionCatalog.findLibrary("junit-platform-suite-api") + .orElseThrow { GradleException("No version for `junit-platform-suite-api`") }) } // This dependency is needed only for FileComparisonFailure - add("testImplementation", intellijJavaRt()) + testImplementation(intellijJavaRt()) // This is needed only for using FileComparisonFailure, which relies on JUnit 3 classes - add("testRuntimeOnly", commonDependency("junit:junit")) + testRuntimeOnly(libsVersionCatalog.findLibrary("junit4").orElseThrow { GradleException("No version for `junit4`") }) } } @@ -237,6 +244,14 @@ private fun DependencyHandler.testApi(dependencyNotation: Any) { add("testApi", dependencyNotation) } +private fun DependencyHandler.testImplementation(dependencyNotation: Any) { + add("testImplementation", dependencyNotation) +} + +private fun DependencyHandler.testRuntimeOnly(dependencyNotation: Any) { + add("testRuntimeOnly", dependencyNotation) +} + val Project.protobufRelocatedVersion: String get() = findProperty("versions.protobuf-relocated") as String fun Project.protobufLite(): String = "org.jetbrains.kotlin:protobuf-lite:$protobufRelocatedVersion" fun Project.protobufFull(): String = "org.jetbrains.kotlin:protobuf-relocated:$protobufRelocatedVersion" diff --git a/wasm/wasm.ir/build.gradle.kts b/wasm/wasm.ir/build.gradle.kts index c7fcef15e8f..1bfb0bd4f8c 100644 --- a/wasm/wasm.ir/build.gradle.kts +++ b/wasm/wasm.ir/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { implementation(kotlinStdlib()) implementation(kotlinxCollectionsImmutable()) - testImplementation(commonDependency("junit:junit")) + testImplementation(libs.junit4) testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) testCompileOnly(project(":kotlin-test:kotlin-test-junit")) testImplementation(projectTests(":compiler:tests-common")) diff --git a/wasm/wasm.tests/build.gradle.kts b/wasm/wasm.tests/build.gradle.kts index d381f45e2a4..d383b7414a5 100644 --- a/wasm/wasm.tests/build.gradle.kts +++ b/wasm/wasm.tests/build.gradle.kts @@ -61,7 +61,7 @@ val jsShell by configurations.creating { } dependencies { - testApi(commonDependency("junit:junit")) + testApi(libs.junit4) testApi(projectTests(":compiler:tests-common")) testApi(projectTests(":compiler:tests-common-new")) testApi(intellijCore())