diff --git a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt index 9691319c238..e39290f7304 100644 --- a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt +++ b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt @@ -3,6 +3,8 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ +@file:Suppress("DEPRECATION") + package org.jetbrains.kotlin.codegen.jdk import org.jetbrains.kotlin.test.runners.codegen.* diff --git a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/JUnitPlatformRunnerForJdk6.kt b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/JUnitPlatformRunnerForJdk6.kt index 2ca1961b934..a01daf7cfee 100644 --- a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/JUnitPlatformRunnerForJdk6.kt +++ b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/JUnitPlatformRunnerForJdk6.kt @@ -3,6 +3,8 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ +@file:Suppress("DEPRECATION") + package org.jetbrains.kotlin.codegen.jdk import org.jetbrains.kotlin.test.InTextDirectivesUtils diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index b87a7405d3d..b9457940c5a 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -3094,16 +3094,6 @@ - - - - - - - - - - @@ -5929,6 +5919,12 @@ + + + + + + @@ -7843,214 +7839,94 @@ - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/gradle/versions.properties b/gradle/versions.properties index 586c9874689..e7f26fad42b 100644 --- a/gradle/versions.properties +++ b/gradle/versions.properties @@ -20,5 +20,5 @@ ignore.jar.snappy-in-java=true versions.gradle-api=4.5.1 versions.jna=5.6.0 versions.shadow=6.1.0 -versions.junit-bom=5.7.0 +versions.junit-bom=5.8.1 versions.org.junit.platform=1.7.0 diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index cebcefc5ca8..70417895069 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -76,7 +76,7 @@ dependencies { antLauncherJar(commonDep("org.apache.ant", "ant")) antLauncherJar(toolsJar()) - testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.6.2") + testRuntimeOnly("org.junit.vintage:junit-vintage-engine:${commonVer("org.junit", "junit-bom")}") } val generationRoot = projectDir.resolve("tests-gen") diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts index 18031c17382..f2310944b28 100644 --- a/plugins/pill/generate-all-tests/build.gradle.kts +++ b/plugins/pill/generate-all-tests/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { } testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) - testRuntimeOnly(platform("org.junit:junit-bom:5.7.0")) + testRuntimeOnly(commonDep("junit-bom")) testRuntimeOnly("org.junit.jupiter:junit-jupiter") }