Update junit dependency 4.12 -> 4.13.2 in tests
This commit is contained in:
Nikolay Krasko
committed by
TeamCityServer
TeamCityServer
parent
af8faadca5
commit
317b0b4495
@@ -108,7 +108,7 @@ tasks.withType(JavaCompile) {
|
||||
|
||||
dependencies {
|
||||
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'
|
||||
|
||||
android.applicationVariants.all { variant ->
|
||||
|
||||
+3
-3
@@ -1456,7 +1456,7 @@ class NewMultiplatformIT : BaseGradleIT() {
|
||||
val originalBuildscriptContent = gradleBuildScript("app").readText()
|
||||
|
||||
fun testDependencies() = testResolveAllConfigurations("app") {
|
||||
assertContains(">> :app:testNonTransitiveStringNotationApiDependenciesMetadata --> junit-4.12.jar")
|
||||
assertContains(">> :app:testNonTransitiveStringNotationApiDependenciesMetadata --> junit-4.13.2.jar")
|
||||
assertEquals(
|
||||
1,
|
||||
(Regex.escape(">> :app:testNonTransitiveStringNotationApiDependenciesMetadata") + " .*").toRegex().findAll(output).count()
|
||||
@@ -1497,10 +1497,10 @@ class NewMultiplatformIT : BaseGradleIT() {
|
||||
fun testMultipleTargetsSamePlatform() = with(Project("newMppMultipleTargetsSamePlatform", gradleVersion)) {
|
||||
testResolveAllConfigurations("app") {
|
||||
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 --> junit-4.12.jar")
|
||||
assertContains(">> :app:mixedJunitCompileClasspath --> junit-4.13.2.jar")
|
||||
|
||||
assertContains(">> :app:testngCompileClasspath --> lib-testng.jar")
|
||||
assertContains(">> :app:testngCompileClasspath --> testng-6.14.3.jar")
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
|
||||
dependencies {
|
||||
implementation project(':Lib')
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
testImplementation'junit:junit:4.12'
|
||||
testImplementation'junit:junit:4.13.2'
|
||||
}
|
||||
|
||||
android {
|
||||
|
||||
+1
-1
@@ -66,5 +66,5 @@ else {
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
testImplementation'junit:junit:4.12'
|
||||
testImplementation'junit:junit:4.13.2'
|
||||
}
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testImplementation'junit:junit:4.12'
|
||||
testImplementation'junit:junit:4.13.2'
|
||||
}
|
||||
|
||||
// important to test that destinationDir is configured before evaluation
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||
testImplementation'junit:junit:4.12'
|
||||
testImplementation'junit:junit:4.13.2'
|
||||
implementation project(":lib")
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
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")
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -34,7 +34,7 @@ dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_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'
|
||||
testImplementation'junit:junit:4.12'
|
||||
testImplementation'junit:junit:4.13.2'
|
||||
}
|
||||
+1
-1
@@ -31,7 +31,7 @@ android {
|
||||
|
||||
dependencies {
|
||||
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"
|
||||
|
||||
|
||||
+1
-1
@@ -80,7 +80,7 @@ dependencies {
|
||||
implementation "androidx.navigation:navigation-fragment-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.espresso:espresso-core:3.1.1'
|
||||
}
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ dependencies {
|
||||
|
||||
implementation files("a")
|
||||
|
||||
testImplementation'junit:junit:4.12'
|
||||
testImplementation'junit:junit:4.13.2'
|
||||
}
|
||||
|
||||
idea {
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
implementation "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 {
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
implementation "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
|
||||
+1
-1
@@ -13,7 +13,7 @@ dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
implementation "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
|
||||
+1
-1
@@ -25,5 +25,5 @@ dependencies {
|
||||
implementation "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"
|
||||
testImplementation 'junit:junit:4.12'
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
}
|
||||
+1
-1
@@ -17,5 +17,5 @@ dependencies {
|
||||
implementation "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"
|
||||
testImplementation 'junit:junit:4.12'
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
}
|
||||
+1
-1
@@ -12,7 +12,7 @@ repositories {
|
||||
dependencies {
|
||||
implementation "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
|
||||
+1
-1
@@ -15,5 +15,5 @@ dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
|
||||
|
||||
testImplementation project(':lib2')
|
||||
testImplementation 'junit:junit:4.13'
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
}
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
|
||||
|
||||
testImplementation project(':lib2')
|
||||
testImplementation 'junit:junit:4.13'
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
}
|
||||
|
||||
kotlin.target.compilations.test {
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
implementation 'com.android.support:appcompat-v7:27.1.1'
|
||||
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.espresso:espresso-core:3.0.2'
|
||||
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
|
||||
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.espresso:espresso-core:3.0.2'
|
||||
}
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ kotlin {
|
||||
sourceSets {
|
||||
create("testNonTransitiveStringNotation") {
|
||||
dependencies {
|
||||
api("junit:junit:4.12") { setTransitive(false) }
|
||||
api("junit:junit:4.13.2") { setTransitive(false) }
|
||||
}
|
||||
}
|
||||
create("testNonTransitiveDependencyNotation") {
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ kotlin {
|
||||
}
|
||||
|
||||
jvm("junit").compilations["main"].defaultSourceSet.dependencies {
|
||||
api("junit:junit:4.12")
|
||||
api("junit:junit:4.13.2")
|
||||
}
|
||||
|
||||
jvm("testng").compilations["main"].defaultSourceSet.dependencies {
|
||||
|
||||
+1
-1
@@ -14,5 +14,5 @@ allOpen {
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
|
||||
testImplementation "junit:junit:4.12"
|
||||
testImplementation "junit:junit:4.13.2"
|
||||
}
|
||||
+1
-1
@@ -14,7 +14,7 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
|
||||
testImplementation "junit:junit:4.12"
|
||||
testImplementation "junit:junit:4.13.2"
|
||||
}
|
||||
|
||||
afterEvaluate {
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||
testImplementation'junit:junit:4.12'
|
||||
testImplementation'junit:junit:4.13.2'
|
||||
implementation project(":lib")
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
|
||||
// // org.junit.Assert.assertThrows was added in 4.13, compilation should fail
|
||||
@file:DependsOn("junit:junit:(4.11,4.12]")
|
||||
|
||||
org.junit.Assert.assertThrows(NullPointerException::class.java) {
|
||||
|
||||
+1
-1
@@ -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)")
|
||||
|
||||
org.junit.Assert.assertThrows(NullPointerException::class.java) {
|
||||
|
||||
Reference in New Issue
Block a user