azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update junit dependency 4.12 -> 4.13.2 in tests

Browse Source
This commit is contained in:
Nikolay Krasko
2021-11-23 15:30:59 +03:00
committed by TeamCityServer
parent af8faadca5
commit 317b0b4495
28 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/android-module/build.gradle
+1 -1
View File
@@ -108,7 +108,7 @@ tasks.withType(JavaCompile) {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['kotlin-test.jar', 'kotlin-stdlib.jar']) implementation fileTree(dir: 'libs', include: ['kotlin-test.jar', 'kotlin-stdlib.jar'])
androidTestImplementation 'junit:junit:4.12' androidTestImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test:runner:1.0.2'
android.applicationVariants.all { variant -> android.applicationVariants.all { variant ->
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+3 -3
View File
@@ -1456,7 +1456,7 @@ class NewMultiplatformIT : BaseGradleIT() {
val originalBuildscriptContent = gradleBuildScript("app").readText() val originalBuildscriptContent = gradleBuildScript("app").readText()
fun testDependencies() = testResolveAllConfigurations("app") { fun testDependencies() = testResolveAllConfigurations("app") {
assertContains(">> :app:testNonTransitiveStringNotationApiDependenciesMetadata --> junit-4.12.jar") assertContains(">> :app:testNonTransitiveStringNotationApiDependenciesMetadata --> junit-4.13.2.jar")
assertEquals( assertEquals(
1, 1,
(Regex.escape(">> :app:testNonTransitiveStringNotationApiDependenciesMetadata") + " .*").toRegex().findAll(output).count() (Regex.escape(">> :app:testNonTransitiveStringNotationApiDependenciesMetadata") + " .*").toRegex().findAll(output).count()
@@ -1497,10 +1497,10 @@ class NewMultiplatformIT : BaseGradleIT() {
fun testMultipleTargetsSamePlatform() = with(Project("newMppMultipleTargetsSamePlatform", gradleVersion)) { fun testMultipleTargetsSamePlatform() = with(Project("newMppMultipleTargetsSamePlatform", gradleVersion)) {
testResolveAllConfigurations("app") { testResolveAllConfigurations("app") {
assertContains(">> :app:junitCompileClasspath --> lib-junit.jar") assertContains(">> :app:junitCompileClasspath --> lib-junit.jar")
assertContains(">> :app:junitCompileClasspath --> junit-4.12.jar") assertContains(">> :app:junitCompileClasspath --> junit-4.13.2.jar")
assertContains(">> :app:mixedJunitCompileClasspath --> lib-junit.jar") assertContains(">> :app:mixedJunitCompileClasspath --> lib-junit.jar")
assertContains(">> :app:mixedJunitCompileClasspath --> junit-4.12.jar") assertContains(">> :app:mixedJunitCompileClasspath --> junit-4.13.2.jar")
assertContains(">> :app:testngCompileClasspath --> lib-testng.jar") assertContains(">> :app:testngCompileClasspath --> lib-testng.jar")
assertContains(">> :app:testngCompileClasspath --> testng-6.14.3.jar") assertContains(">> :app:testngCompileClasspath --> testng-6.14.3.jar")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidJackProject/Android/build.gradle
+1 -1
View File
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
dependencies { dependencies {
implementation project(':Lib') implementation project(':Lib')
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testImplementation'junit:junit:4.12' testImplementation'junit:junit:4.13.2'
} }
android { android {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle
+1 -1
View File
@@ -66,5 +66,5 @@ else {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testImplementation'junit:junit:4.12' testImplementation'junit:junit:4.13.2'
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/destinationDirReferencedDuringEvaluation/build.gradle
+1 -1
View File
@@ -9,7 +9,7 @@ repositories {
} }
dependencies { dependencies {
testImplementation'junit:junit:4.12' testImplementation'junit:junit:4.13.2'
} }
// important to test that destinationDir is configured before evaluation // important to test that destinationDir is configured before evaluation
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyInterop/build.gradle
+1 -1
View File
@@ -10,7 +10,7 @@ repositories {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
testImplementation'junit:junit:4.12' testImplementation'junit:junit:4.13.2'
implementation project(":lib") implementation project(":lib")
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/interopWithProguarded/build.gradle
+1 -1
View File
@@ -10,7 +10,7 @@ repositories {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
testImplementation'junit:junit:4.12' testImplementation'junit:junit:4.13.2'
implementation project(path: ":lib", configuration: "proguarded") implementation project(path: ":lib", configuration: "proguarded")
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding/app/build.gradle
+2 -2
View File
@@ -34,7 +34,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
kapt "com.android.databinding:compiler:$android_tools_version" kapt "com.android.databinding:compiler:$android_tools_version"
kaptAndroidTest "junit:junit:4.12" kaptAndroidTest "junit:junit:4.13.2"
implementation 'com.android.support.constraint:constraint-layout:1.0.2' implementation 'com.android.support.constraint:constraint-layout:1.0.2'
testImplementation'junit:junit:4.12' testImplementation'junit:junit:4.13.2'
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding/library/build.gradle
+1 -1
View File
@@ -31,7 +31,7 @@ android {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13.2'
kapt "com.android.databinding:compiler:$android_tools_version" kapt "com.android.databinding:compiler:$android_tools_version"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/androidx-navigation-safe-args/build.gradle
+1 -1
View File
@@ -80,7 +80,7 @@ dependencies {
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.0' androidTestImplementation 'androidx.test.ext:junit:1.1.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/localAnnotationProcessor/example/build.gradle
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
implementation files("a") implementation files("a")
testImplementation'junit:junit:4.12' testImplementation'junit:junit:4.13.2'
} }
idea { idea {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/locationMapping/build.gradle
+1 -1
View File
@@ -13,7 +13,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
testImplementation'junit:junit:4.12' testImplementation'junit:junit:4.13.2'
} }
kapt { kapt {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/nokapt/build.gradle
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
testImplementation'junit:junit:4.12' testImplementation'junit:junit:4.13.2'
} }
compileKotlin.kotlinOptions.allWarningsAsErrors = true compileKotlin.kotlinOptions.allWarningsAsErrors = true
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/simple/build.gradle
+1 -1
View File
@@ -13,7 +13,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13.2'
} }
compileKotlin.kotlinOptions.allWarningsAsErrors = true compileKotlin.kotlinOptions.allWarningsAsErrors = true
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalAggregatingProcessorProject/build.gradle
+1 -1
View File
@@ -25,5 +25,5 @@ dependencies {
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.intellij.deps:asm-all:9.0" kapt "org.jetbrains.intellij.deps:asm-all:9.0"
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13.2'
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalCompilationProject/build.gradle
+1 -1
View File
@@ -17,5 +17,5 @@ dependencies {
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.intellij.deps:asm-all:9.0" kapt "org.jetbrains.intellij.deps:asm-all:9.0"
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13.2'
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-java-toolchain/simpleWithKapt/build.gradle
+1 -1
View File
@@ -12,7 +12,7 @@ repositories {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" implementation "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version" kapt "org.jetbrains.kotlin:annotation-processor-example:$kotlin_version"
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13.2'
} }
compileKotlin.kotlinOptions.allWarningsAsErrors = true compileKotlin.kotlinOptions.allWarningsAsErrors = true
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-35942-android/lib1/build.gradle
+1 -1
View File
@@ -15,5 +15,5 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
testImplementation project(':lib2') testImplementation project(':lib2')
testImplementation 'junit:junit:4.13' testImplementation 'junit:junit:4.13.2'
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-35942-jvm/lib1/build.gradle
+1 -1
View File
@@ -4,7 +4,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
testImplementation project(':lib2') testImplementation project(':lib2')
testImplementation 'junit:junit:4.13' testImplementation 'junit:junit:4.13.2'
} }
kotlin.target.compilations.test { kotlin.target.compilations.test {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle
+1 -1
View File
@@ -31,7 +31,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.support.constraint:constraint-layout:1.1.2'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle
+1 -1
View File
@@ -31,7 +31,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:appcompat-v7:27.1.1'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/newMppDependenciesDsl/app/build.gradle
+1 -1
View File
@@ -14,7 +14,7 @@ kotlin {
sourceSets { sourceSets {
create("testNonTransitiveStringNotation") { create("testNonTransitiveStringNotation") {
dependencies { dependencies {
api("junit:junit:4.12") { setTransitive(false) } api("junit:junit:4.13.2") { setTransitive(false) }
} }
} }
create("testNonTransitiveDependencyNotation") { create("testNonTransitiveDependencyNotation") {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/newMppMultipleTargetsSamePlatform/lib/build.gradle.kts
+1 -1
View File
@@ -12,7 +12,7 @@ kotlin {
} }
jvm("junit").compilations["main"].defaultSourceSet.dependencies { jvm("junit").compilations["main"].defaultSourceSet.dependencies {
api("junit:junit:4.12") api("junit:junit:4.13.2")
} }
jvm("testng").compilations["main"].defaultSourceSet.dependencies { jvm("testng").compilations["main"].defaultSourceSet.dependencies {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/allopenPluginsDsl/build.gradle
+1 -1
View File
@@ -14,5 +14,5 @@ allOpen {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
testImplementation "junit:junit:4.12" testImplementation "junit:junit:4.13.2"
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyAllPlugins/build.gradle
+1 -1
View File
@@ -14,7 +14,7 @@ repositories {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
testImplementation "junit:junit:4.12" testImplementation "junit:junit:4.13.2"
} }
afterEvaluate { afterEvaluate {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/scalaInterop/build.gradle
+1 -1
View File
@@ -10,7 +10,7 @@ repositories {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
testImplementation'junit:junit:4.12' testImplementation'junit:junit:4.13.2'
implementation project(":lib") implementation project(":lib")
} }
libraries/tools/kotlin-main-kts-test/testData/hello-resolve-junit-dynver-error.main.kts
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// // org.junit.Assert.assertThrows was added in 4.13, compilation should fail
@file:DependsOn("junit:junit:(4.11,4.12]") @file:DependsOn("junit:junit:(4.11,4.12]")
org.junit.Assert.assertThrows(NullPointerException::class.java) { org.junit.Assert.assertThrows(NullPointerException::class.java) {
libraries/tools/kotlin-main-kts-test/testData/hello-resolve-junit-dynver.main.kts
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// org.junit.Assert.assertThrows was added in 4.13, compilation should be fine
@file:DependsOn("junit:junit:(4.12,5.0)") @file:DependsOn("junit:junit:(4.12,5.0)")
org.junit.Assert.assertThrows(NullPointerException::class.java) { org.junit.Assert.assertThrows(NullPointerException::class.java) {