diff --git a/analysis/analysis-api-fe10/build.gradle.kts b/analysis/analysis-api-fe10/build.gradle.kts index ab621c6fbda..ab612a15bcb 100644 --- a/analysis/analysis-api-fe10/build.gradle.kts +++ b/analysis/analysis-api-fe10/build.gradle.kts @@ -19,8 +19,8 @@ dependencies { implementation(project(":compiler:backend.jvm.entrypoint")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(project(":analysis:analysis-api-providers")) testImplementation(project(":analysis:analysis-api-standalone:analysis-api-standalone-base")) testImplementation(projectTests(":compiler:tests-common")) diff --git a/analysis/analysis-api-fir/build.gradle.kts b/analysis/analysis-api-fir/build.gradle.kts index 123e3e67194..f3bad443fa7 100644 --- a/analysis/analysis-api-fir/build.gradle.kts +++ b/analysis/analysis-api-fir/build.gradle.kts @@ -49,8 +49,8 @@ dependencies { testImplementation(toolsJar()) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(project(":analysis:symbol-light-classes")) } diff --git a/analysis/analysis-api-impl-barebone/build.gradle.kts b/analysis/analysis-api-impl-barebone/build.gradle.kts index 65e0dcb0c35..a94b04281bf 100644 --- a/analysis/analysis-api-impl-barebone/build.gradle.kts +++ b/analysis/analysis-api-impl-barebone/build.gradle.kts @@ -10,8 +10,8 @@ dependencies { api(intellijCore()) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(project(":kotlin-test:kotlin-test-junit")) testImplementation(projectTests(":compiler:tests-common")) testApi(projectTests(":compiler:test-infrastructure-utils")) diff --git a/analysis/analysis-api-impl-base/build.gradle.kts b/analysis/analysis-api-impl-base/build.gradle.kts index 30a63529af3..1b3a7eb28fe 100644 --- a/analysis/analysis-api-impl-base/build.gradle.kts +++ b/analysis/analysis-api-impl-base/build.gradle.kts @@ -14,8 +14,8 @@ dependencies { implementation(project(":analysis:analysis-internal-utils")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(project(":kotlin-test:kotlin-test-junit")) testImplementation(project(":analysis:analysis-api")) testImplementation(project(":analysis:analysis-api-standalone:analysis-api-standalone-base")) diff --git a/analysis/analysis-api-standalone/build.gradle.kts b/analysis/analysis-api-standalone/build.gradle.kts index e700858f77a..066cc5873e0 100644 --- a/analysis/analysis-api-standalone/build.gradle.kts +++ b/analysis/analysis-api-standalone/build.gradle.kts @@ -23,8 +23,8 @@ dependencies { testImplementation(project(":kotlin-test:kotlin-test-junit")) testImplementation(toolsJar()) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) } kotlin { diff --git a/analysis/analysis-test-framework/build.gradle.kts b/analysis/analysis-test-framework/build.gradle.kts index 665ba64dbda..7add75926a0 100644 --- a/analysis/analysis-test-framework/build.gradle.kts +++ b/analysis/analysis-test-framework/build.gradle.kts @@ -7,8 +7,8 @@ dependencies { testImplementation(kotlinStdlib()) testImplementation(intellijCore()) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(project(":kotlin-test:kotlin-test-junit")) testImplementation(project(":analysis:analysis-internal-utils")) diff --git a/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts index c155886605c..2a5ff6aa07c 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts +++ b/analysis/decompiled/decompiler-to-file-stubs/build.gradle.kts @@ -17,8 +17,8 @@ dependencies { testImplementation(projectTests(":compiler:tests-common")) testImplementation(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":analysis:analysis-test-framework")) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) } sourceSets { diff --git a/analysis/decompiled/decompiler-to-psi/build.gradle.kts b/analysis/decompiled/decompiler-to-psi/build.gradle.kts index 092f71b3671..db2427880ca 100644 --- a/analysis/decompiled/decompiler-to-psi/build.gradle.kts +++ b/analysis/decompiled/decompiler-to-psi/build.gradle.kts @@ -18,8 +18,8 @@ dependencies { testImplementation(projectTests(":compiler:tests-common")) testImplementation(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) } sourceSets { diff --git a/analysis/low-level-api-fir/build.gradle.kts b/analysis/low-level-api-fir/build.gradle.kts index b4248a16b43..65686e6bf7b 100644 --- a/analysis/low-level-api-fir/build.gradle.kts +++ b/analysis/low-level-api-fir/build.gradle.kts @@ -51,8 +51,8 @@ dependencies { testImplementation(projectTests(":analysis:analysis-api-impl-base")) testImplementation(project(":kotlin-test:kotlin-test-junit")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(project(":analysis:symbol-light-classes")) testRuntimeOnly(project(":core:descriptors.runtime")) diff --git a/analysis/symbol-light-classes/build.gradle.kts b/analysis/symbol-light-classes/build.gradle.kts index b8b88366f58..c4479b785d4 100644 --- a/analysis/symbol-light-classes/build.gradle.kts +++ b/analysis/symbol-light-classes/build.gradle.kts @@ -24,8 +24,8 @@ dependencies { testImplementation(projectTests(":analysis:analysis-api-fir")) testImplementation(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":analysis:low-level-api-fir")) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) } sourceSets { diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index bc267b73429..4f9b25b8b14 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -24,9 +24,9 @@ dependencies { testCompileOnly(project(":compiler:cli-common")) testApi(projectTests(":compiler:tests-common")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) - testImplementation(libs.junit.jupyter.params) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) + testImplementation(libs.junit.jupiter.params) testImplementation(libs.junit4) testApi(protobufFull()) testApi(kotlinStdlib()) diff --git a/compiler/build-tools/kotlin-build-tools-api/build.gradle.kts b/compiler/build-tools/kotlin-build-tools-api/build.gradle.kts index ffc6349252e..42a1765778a 100644 --- a/compiler/build-tools/kotlin-build-tools-api/build.gradle.kts +++ b/compiler/build-tools/kotlin-build-tools-api/build.gradle.kts @@ -11,8 +11,8 @@ configureKotlinCompileTasksGradleCompatibility() dependencies { compileOnly(kotlinStdlib()) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(kotlinStdlib()) } diff --git a/compiler/fir/analysis-tests/build.gradle.kts b/compiler/fir/analysis-tests/build.gradle.kts index 1aa63834359..fe414665989 100644 --- a/compiler/fir/analysis-tests/build.gradle.kts +++ b/compiler/fir/analysis-tests/build.gradle.kts @@ -27,8 +27,8 @@ dependencies { testApi(project(":compiler:frontend")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testRuntimeOnly(project(":core:descriptors.runtime")) testRuntimeOnly(project(":compiler:fir:fir2ir:jvm-backend")) diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts index 7f0645ab456..670e310fa14 100644 --- a/compiler/fir/fir2ir/build.gradle.kts +++ b/compiler/fir/fir2ir/build.gradle.kts @@ -30,8 +30,8 @@ dependencies { testApi(projectTests(":compiler:fir:analysis-tests")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testRuntimeOnly(project(":core:deserialization")) testRuntimeOnly(project(":core:descriptors.runtime")) diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts index 2d08e549cc5..5d5c65f3b61 100644 --- a/compiler/tests-common-new/build.gradle.kts +++ b/compiler/tests-common-new/build.gradle.kts @@ -19,8 +19,8 @@ dependencies { testImplementation(projectTests(":generators:test-generator")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testApi(libs.junit.platform.launcher) testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure-utils")) diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index a94becdfd58..dfb84a1bb0b 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -82,8 +82,8 @@ dependencies { testImplementation(commonDependency("org.jetbrains.intellij.deps:jdom")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) } optInToExperimentalCompilerApi() diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts index 1fcc8828236..11c53914206 100644 --- a/compiler/tests-different-jdk/build.gradle.kts +++ b/compiler/tests-different-jdk/build.gradle.kts @@ -11,8 +11,8 @@ dependencies { testApi(projectTests(":compiler:tests-common-new")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(libs.junit.platform.runner) testImplementation(libs.junit.platform.suite.api) runtimeOnly(libs.junit.vintage.engine) diff --git a/compiler/tests-for-compiler-generator/build.gradle.kts b/compiler/tests-for-compiler-generator/build.gradle.kts index b2dba530723..f466193b785 100644 --- a/compiler/tests-for-compiler-generator/build.gradle.kts +++ b/compiler/tests-for-compiler-generator/build.gradle.kts @@ -7,8 +7,8 @@ dependencies { testImplementation(kotlinStdlib()) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(projectTests(":compiler:tests-common")) testImplementation(projectTests(":compiler:test-infrastructure")) testImplementation(projectTests(":compiler:tests-common-new")) diff --git a/compiler/tests-spec/build.gradle.kts b/compiler/tests-spec/build.gradle.kts index c1ae15d9f00..53572632b65 100644 --- a/compiler/tests-spec/build.gradle.kts +++ b/compiler/tests-spec/build.gradle.kts @@ -17,9 +17,9 @@ dependencies { testRuntimeOnly(project(":core:descriptors.runtime")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) - testImplementation(libs.junit.jupyter.params) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) + testImplementation(libs.junit.jupiter.params) runtimeOnly(libs.junit.vintage.engine) testImplementation(libs.junit4) } diff --git a/compiler/util-klib-abi/build.gradle.kts b/compiler/util-klib-abi/build.gradle.kts index 97386b5fea9..122617c0e32 100644 --- a/compiler/util-klib-abi/build.gradle.kts +++ b/compiler/util-klib-abi/build.gradle.kts @@ -10,9 +10,9 @@ dependencies { implementation(project(":compiler:ir.serialization.common")) compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) - testImplementation(libs.junit.jupyter.params) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) + testImplementation(libs.junit.jupiter.params) testImplementation(intellijCore()) testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testImplementation(projectTests(":compiler:tests-common-new")) diff --git a/compiler/visualizer/build.gradle.kts b/compiler/visualizer/build.gradle.kts index ef34445fcef..55c30f09e46 100644 --- a/compiler/visualizer/build.gradle.kts +++ b/compiler/visualizer/build.gradle.kts @@ -12,8 +12,8 @@ dependencies { testImplementation(project(":compiler:visualizer:render-fir")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testApi(projectTests(":compiler:tests-compiler-utils")) testApi(projectTests(":compiler:tests-common-new")) diff --git a/generators/analysis-api-generator/build.gradle.kts b/generators/analysis-api-generator/build.gradle.kts index 718cee86e21..57a36d2e29b 100644 --- a/generators/analysis-api-generator/build.gradle.kts +++ b/generators/analysis-api-generator/build.gradle.kts @@ -26,8 +26,8 @@ dependencies { testImplementation(projectTests(":analysis:decompiled:native")) testImplementation(intellijCore()) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) } val generateFrontendApiTests by generator("org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt") diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 9801851bafd..c6d9538ffd8 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -80,8 +80,8 @@ dependencies { testImplementation(project(":kotlin-gradle-compiler-types")) testImplementation(project(":jps:jps-common")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) if (Ide.IJ()) { testCompileOnly(jpsBuildTest()) diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts index 2ee9543c83a..3f8fac63ea9 100644 --- a/generators/test-generator/build.gradle.kts +++ b/generators/test-generator/build.gradle.kts @@ -10,8 +10,8 @@ dependencies { testApi(kotlinStdlib()) testImplementation(libs.junit4) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testApi(project(":generators")) testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 987a47cd4fb..573a62b6446 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,9 +55,9 @@ 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-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" } -junit-jupyter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" } -junit-jupyter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" } +junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" } +junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" } +junit-jupiter-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" } diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index d6cba8560a8..a6347e5ed83 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -34,8 +34,8 @@ val testJsRuntime by configurations.creating { dependencies { testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testRuntimeOnly(libs.junit.vintage.engine) testApi(protobufFull()) diff --git a/libraries/kotlin.test/junit5/build.gradle b/libraries/kotlin.test/junit5/build.gradle index 246eaae23a8..035142b9692 100644 --- a/libraries/kotlin.test/junit5/build.gradle +++ b/libraries/kotlin.test/junit5/build.gradle @@ -17,7 +17,7 @@ dependencies { api project(':kotlin-test:kotlin-test-jvm') api("org.junit.jupiter:junit-jupiter-api:5.0.0") - testRuntimeOnly(libs.junit.jupyter.engine) + testRuntimeOnly(libs.junit.jupiter.engine) } jar { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index b9019fdd63f..ba8e13f7f81 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -97,10 +97,10 @@ dependencies { testImplementation(gradleTestKit()) testImplementation(commonDependency("com.google.code.gson:gson")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testRuntimeOnly(libs.junit.vintage.engine) - testImplementation(libs.junit.jupyter.params) + testImplementation(libs.junit.jupiter.params) testRuntimeOnly(project(":compiler:tests-mutes")) diff --git a/native/native.tests/build.gradle.kts b/native/native.tests/build.gradle.kts index e53725fe3c8..9d572cae7a8 100644 --- a/native/native.tests/build.gradle.kts +++ b/native/native.tests/build.gradle.kts @@ -19,8 +19,8 @@ dependencies { testImplementation(project(":kotlin-util-klib-abi")) testImplementation(projectTests(":kotlin-util-klib-abi")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-metadata-klib")) testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } diff --git a/native/utils/build.gradle.kts b/native/utils/build.gradle.kts index f8aa02510a2..28fdf87471f 100644 --- a/native/utils/build.gradle.kts +++ b/native/utils/build.gradle.kts @@ -15,8 +15,8 @@ dependencies { testImplementation(kotlinStdlib()) testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) } sourceSets { diff --git a/plugins/allopen/build.gradle.kts b/plugins/allopen/build.gradle.kts index 401b72f006f..2cfefa5cb2d 100644 --- a/plugins/allopen/build.gradle.kts +++ b/plugins/allopen/build.gradle.kts @@ -24,8 +24,8 @@ dependencies { testRuntimeOnly(commonDependency("com.fasterxml:aalto-xml")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":compiler:test-infrastructure")) testImplementation(projectTests(":compiler:test-infrastructure-utils")) diff --git a/plugins/assign-plugin/build.gradle.kts b/plugins/assign-plugin/build.gradle.kts index b8cbc5373db..e1f2698bdaa 100644 --- a/plugins/assign-plugin/build.gradle.kts +++ b/plugins/assign-plugin/build.gradle.kts @@ -20,13 +20,13 @@ dependencies { testApi(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":compiler:tests-common")) - testImplementation(libs.junit.jupyter.api) + testImplementation(libs.junit.jupiter.api) testCompileOnly(project(":kotlin-reflect-api")) testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":core:descriptors.runtime")) testRuntimeOnly(project(":compiler:fir:fir-serialization")) - testRuntimeOnly(libs.junit.jupyter.engine) + testRuntimeOnly(libs.junit.jupiter.engine) testApi(intellijCore()) } diff --git a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts index cf1204eab17..a85ba007498 100644 --- a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts +++ b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts @@ -103,8 +103,8 @@ dependencies { testCompileOnly("org.jetbrains.kotlinx:atomicfu:0.21.0") testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testRuntimeOnly(kotlinStdlib()) testRuntimeOnly(project(":kotlin-preloader")) // it's required for ant tests diff --git a/plugins/fir-plugin-prototype/build.gradle.kts b/plugins/fir-plugin-prototype/build.gradle.kts index 600644d18b6..a29da452560 100644 --- a/plugins/fir-plugin-prototype/build.gradle.kts +++ b/plugins/fir-plugin-prototype/build.gradle.kts @@ -20,8 +20,8 @@ dependencies { compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testApi(projectTests(":compiler:tests-common-new")) testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure-utils")) diff --git a/plugins/fir-plugin-prototype/fir-plugin-ic-test/build.gradle.kts b/plugins/fir-plugin-prototype/fir-plugin-ic-test/build.gradle.kts index ad2ebad2e8e..cd43f928abc 100644 --- a/plugins/fir-plugin-prototype/fir-plugin-ic-test/build.gradle.kts +++ b/plugins/fir-plugin-prototype/fir-plugin-ic-test/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { testApi(project(":plugins:fir-plugin-prototype")) testApi(project(":compiler:incremental-compilation-impl")) testApi(projectTests(":compiler:incremental-compilation-impl")) - testImplementation(libs.junit.jupyter.api) + testImplementation(libs.junit.jupiter.api) testCompileOnly(intellijCore()) diff --git a/plugins/kapt3/kapt3-base/build.gradle.kts b/plugins/kapt3/kapt3-base/build.gradle.kts index fe89aa94867..9645729a6f3 100644 --- a/plugins/kapt3/kapt3-base/build.gradle.kts +++ b/plugins/kapt3/kapt3-base/build.gradle.kts @@ -8,8 +8,8 @@ dependencies { compileOnly(toolsJarApi()) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testCompileOnly(toolsJarApi()) testRuntimeOnly(toolsJar()) } diff --git a/plugins/kapt3/kapt3-cli/build.gradle.kts b/plugins/kapt3/kapt3-cli/build.gradle.kts index 0b6e4a3cb0c..2f01de4a75d 100644 --- a/plugins/kapt3/kapt3-cli/build.gradle.kts +++ b/plugins/kapt3/kapt3-cli/build.gradle.kts @@ -12,8 +12,8 @@ dependencies { testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:tests-common-new")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) } sourceSets { diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index c9864272004..f3f0495cdfd 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -28,8 +28,8 @@ dependencies { testRuntimeOnly(commonDependency("com.fasterxml:aalto-xml")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testApi(projectTests(":compiler:tests-common-new")) testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure-utils")) diff --git a/plugins/kapt4/build.gradle.kts b/plugins/kapt4/build.gradle.kts index 10946986684..6e2d76f1e21 100644 --- a/plugins/kapt4/build.gradle.kts +++ b/plugins/kapt4/build.gradle.kts @@ -35,8 +35,8 @@ dependencies { embedded(project(":analysis:symbol-light-classes")) { isTransitive = false } testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testApi(projectTests(":kotlin-annotation-processing-compiler")) testImplementation(project(":analysis:analysis-api-standalone")) testRuntimeOnly(toolsJar()) diff --git a/plugins/kotlinx-serialization/build.gradle.kts b/plugins/kotlinx-serialization/build.gradle.kts index 97bff24a82f..9135d8da4cd 100644 --- a/plugins/kotlinx-serialization/build.gradle.kts +++ b/plugins/kotlinx-serialization/build.gradle.kts @@ -41,8 +41,8 @@ dependencies { testImplementation(projectTests(":generators:test-generator")) testImplementation(projectTests(":js:js.tests")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(project(":kotlinx-serialization-compiler-plugin.common")) testImplementation(project(":kotlinx-serialization-compiler-plugin.k1")) diff --git a/plugins/lombok/build.gradle.kts b/plugins/lombok/build.gradle.kts index 19129ce35c9..3d364f90026 100644 --- a/plugins/lombok/build.gradle.kts +++ b/plugins/lombok/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { testApi(projectTests(":compiler:tests-common-new")) testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure-utils")) - testImplementation(libs.junit.jupyter.api) + testImplementation(libs.junit.jupiter.api) // FIR dependencies testApi(project(":compiler:fir:checkers")) @@ -36,7 +36,7 @@ dependencies { testRuntimeOnly(project(":compiler:fir:fir-serialization")) testRuntimeOnly(project(":core:descriptors.runtime")) - testRuntimeOnly(libs.junit.jupyter.engine) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(libs.junit4) diff --git a/plugins/noarg/build.gradle.kts b/plugins/noarg/build.gradle.kts index 00d78f46633..6b18d19dc6f 100644 --- a/plugins/noarg/build.gradle.kts +++ b/plugins/noarg/build.gradle.kts @@ -17,8 +17,8 @@ dependencies { testApi(project(":kotlin-noarg-compiler-plugin.cli")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testApi(projectTests(":compiler:tests-common-new")) testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:test-infrastructure-utils")) diff --git a/plugins/parcelize/parcelize-compiler/build.gradle.kts b/plugins/parcelize/parcelize-compiler/build.gradle.kts index 5fab0fa0ff8..e2707729691 100644 --- a/plugins/parcelize/parcelize-compiler/build.gradle.kts +++ b/plugins/parcelize/parcelize-compiler/build.gradle.kts @@ -20,8 +20,8 @@ dependencies { embedded(project(":plugins:parcelize:parcelize-compiler:parcelize.cli")) { isTransitive = false } testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testApi(intellijCore()) diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts index 3e1c4930d31..e824ed5ba7d 100644 --- a/plugins/pill/generate-all-tests/build.gradle.kts +++ b/plugins/pill/generate-all-tests/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) testRuntimeOnly(platform(libs.junit.bom)) - testRuntimeOnly(libs.junit.jupyter.engine) + testRuntimeOnly(libs.junit.jupiter.engine) 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 edd2eef0148..4bd5a91c949 100644 --- a/plugins/sam-with-receiver/build.gradle.kts +++ b/plugins/sam-with-receiver/build.gradle.kts @@ -18,8 +18,8 @@ dependencies { testImplementation(project(":kotlin-scripting-jvm-host-unshaded")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testRuntimeOnly(libs.junit.vintage.engine) testApi(projectTests(":compiler:tests-common-new")) diff --git a/repo/artifacts-tests/build.gradle.kts b/repo/artifacts-tests/build.gradle.kts index b1d8bb69f7a..eb68592f946 100644 --- a/repo/artifacts-tests/build.gradle.kts +++ b/repo/artifacts-tests/build.gradle.kts @@ -9,8 +9,8 @@ dependencies { testImplementation(kotlinStdlib("jdk8")) testImplementation(project(":kotlin-test:kotlin-test-junit5")) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(projectTests(":compiler:tests-common-new")) } diff --git a/wasm/wasm.tests/build.gradle.kts b/wasm/wasm.tests/build.gradle.kts index a24725a93e8..2ef9860530d 100644 --- a/wasm/wasm.tests/build.gradle.kts +++ b/wasm/wasm.tests/build.gradle.kts @@ -65,8 +65,8 @@ dependencies { testApi(projectTests(":compiler:tests-common-new")) testApi(intellijCore()) testApi(platform(libs.junit.bom)) - testImplementation(libs.junit.jupyter.api) - testRuntimeOnly(libs.junit.jupyter.engine) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) jsShell("org.mozilla:jsshell:$jsShellVersion:$jsShellSuffix@zip")