From af8faadca52274e3a439d924e784964bc6b0d31f Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 23 Nov 2021 15:30:18 +0300 Subject: [PATCH] Update internal project junit dependency 4.12 -> 4.13.2 --- build.gradle.kts | 2 +- gradle/verification-metadata.xml | 6 ++++++ kotlin-native/Interop/StubGenerator/build.gradle | 2 +- kotlin-native/backend.native/tests/build.gradle | 2 +- kotlin-native/klib/build.gradle | 2 +- .../tools/kotlin-native-gradle-plugin/build.gradle | 2 +- .../tools/kotlin-gradle-build-metrics/build.gradle.kts | 2 +- libraries/tools/kotlin-gradle-plugin/build.gradle.kts | 2 +- libraries/tools/kotlin-gradle-statistics/build.gradle.kts | 2 +- libraries/tools/kotlin-noarg/build.gradle | 2 +- libraries/tools/kotlin-sam-with-receiver/build.gradle | 2 +- 11 files changed, 16 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 599aa75c71c..1a0e041357b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -123,7 +123,7 @@ extra["versions.javax.inject"] = "1" extra["versions.jsr305"] = "1.3.9" extra["versions.jansi"] = "1.16" extra["versions.jline"] = "3.3.1" -extra["versions.junit"] = "4.12" +extra["versions.junit"] = "4.13.2" extra["versions.javaslang"] = "2.0.6" extra["versions.ant"] = "1.10.7" extra["versions.android"] = "2.3.1" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 2c5104fc261..aa797b239f0 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -3114,6 +3114,12 @@ + + + + + + diff --git a/kotlin-native/Interop/StubGenerator/build.gradle b/kotlin-native/Interop/StubGenerator/build.gradle index e841858a40a..35ac20d865c 100644 --- a/kotlin-native/Interop/StubGenerator/build.gradle +++ b/kotlin-native/Interop/StubGenerator/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation(project(":compiler:util")) implementation(project(":compiler:ir.serialization.common")) - testImplementation "junit:junit:4.12" + testImplementation DependenciesKt.commonDep(project, "junit") testImplementation project(":kotlin-test:kotlin-test-junit") } diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index c2ce651f64b..aa321f2c1b1 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -6075,7 +6075,7 @@ dependencies { api project(kotlinCompilerModule) api project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements') - api 'junit:junit:4.12' + api DependenciesKt.commonDep(project, "junit") } project.tasks.named("test").configure { diff --git a/kotlin-native/klib/build.gradle b/kotlin-native/klib/build.gradle index 88f1c1b75c0..7b3aace592c 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 "junit:junit:4.12" + testImplementation DependenciesKt.commonDep(project, "junit") testImplementation project(":kotlin-test:kotlin-test-junit") } diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle index 475d4c25dd1..665ed3704b0 100644 --- a/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle +++ b/kotlin-native/tools/kotlin-native-gradle-plugin/build.gradle @@ -78,7 +78,7 @@ dependencies { bundleDependencies "org.jetbrains.kotlin:kotlin-util-io:$kotlinVersion" bundleDependencies "org.jetbrains.kotlin:kotlin-util-klib:$kotlinVersion" - testImplementation 'junit:junit:4.12' + testImplementation DependenciesKt.commonDep(project, "junit") testImplementation "org.jetbrains.kotlin:kotlin-test:${project.bootstrapKotlinVersion}" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${project.bootstrapKotlinVersion}" testImplementation "org.tools4j:tools4j-spockito:1.6" diff --git a/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts b/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts index 18ceba29f1d..5b2559c9fa4 100644 --- a/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts @@ -7,7 +7,7 @@ plugins { dependencies { testImplementation(project(":kotlin-test:kotlin-test-junit")) - testImplementation("junit:junit:4.12") + testImplementation(commonDep("junit:junit")) } sourceSets { diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 97d22a631b9..6187998dea6 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -96,7 +96,7 @@ dependencies { testImplementation(project(":kotlin-android-extensions")) testImplementation(project(":kotlin-compiler-runner")) testImplementation(project(":kotlin-test::kotlin-test-junit")) - testImplementation("junit:junit:4.12") + testImplementation(commonDep("junit:junit")) testImplementation(project(":kotlin-gradle-statistics")) testCompileOnly(project(":kotlin-reflect-api")) testCompileOnly(project(":kotlin-annotation-processing")) diff --git a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts index 18ceba29f1d..be246c60106 100644 --- a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts @@ -7,7 +7,7 @@ plugins { dependencies { testImplementation(project(":kotlin-test:kotlin-test-junit")) - testImplementation("junit:junit:4.12") + testImplementation(commonDep("junit")) } sourceSets { diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle index 4334e635794..6349ac370a7 100644 --- a/libraries/tools/kotlin-noarg/build.gradle +++ b/libraries/tools/kotlin-noarg/build.gradle @@ -15,7 +15,7 @@ dependencies { compileOnly project(':kotlin-noarg-compiler-plugin') testApi gradleApi() - testApi "junit:junit:4.12" + testApi(DependenciesKt.commonDep(project, "junit")) embedded(project(":kotlin-noarg-compiler-plugin")) { transitive = false } } diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle index b5294d247e8..fca3e63c0e4 100644 --- a/libraries/tools/kotlin-sam-with-receiver/build.gradle +++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle @@ -15,7 +15,7 @@ dependencies { compileOnly project(':kotlin-sam-with-receiver-compiler-plugin') testApi gradleApi() - testApi "junit:junit:4.12" + testApi DependenciesKt.commonDep(project, "junit") embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { transitive = false } }