Fix test project uses removed configuration for dependencies.
^KT-44949 In Progress
This commit is contained in:
+1
-1
@@ -262,7 +262,7 @@ open class Kapt3IT : Kapt3BaseIT() {
|
||||
fun testChangeClasspathICRebuild() {
|
||||
testICRebuild { project ->
|
||||
project.projectFile("build.gradle").modify {
|
||||
"$it\ndependencies { compile 'org.jetbrains.kotlin:kotlin-reflect:' + kotlin_version }"
|
||||
"$it\ndependencies { implementation 'org.jetbrains.kotlin:kotlin-reflect:' + kotlin_version }"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -126,9 +126,9 @@ class SimpleKotlinGradleIT : BaseGradleIT() {
|
||||
@Test
|
||||
fun testGroovyInterop() {
|
||||
Project("groovyInterop").build("build") {
|
||||
assertSuccessful()
|
||||
assertTasksExecuted(":test")
|
||||
assertContains("GroovyInteropTest PASSED")
|
||||
assertSuccessful()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -137,9 +137,9 @@ class SimpleKotlinGradleIT : BaseGradleIT() {
|
||||
@Test
|
||||
fun testInteropWithProguarded() {
|
||||
Project("interopWithProguarded").build("build") {
|
||||
assertSuccessful()
|
||||
assertTasksExecuted(":test")
|
||||
assertContains("InteropWithProguardedTest PASSED")
|
||||
assertSuccessful()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -17,10 +17,10 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||
testImplementation'junit:junit:4.12'
|
||||
compile project(":lib")
|
||||
implementation project(":lib")
|
||||
}
|
||||
|
||||
compileKotlin {
|
||||
|
||||
+2
-1
@@ -1,9 +1,10 @@
|
||||
apply plugin: "groovy"
|
||||
apply plugin: "java-library"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile 'org.codehaus.groovy:groovy-all:2.5.3'
|
||||
api 'org.codehaus.groovy:groovy-all:2.5.3'
|
||||
}
|
||||
|
||||
+6
-4
@@ -17,16 +17,18 @@ repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
|
||||
configurations {
|
||||
resolvableImplementation {
|
||||
extendsFrom(findByName("implementation"))
|
||||
canBeResolved = true
|
||||
}
|
||||
}
|
||||
|
||||
task obfuscate(type: proguard.gradle.ProGuardTask, dependsOn: jar) {
|
||||
injars "${jar.archivePath}"
|
||||
outjars "$buildDir/proguard/out.jar"
|
||||
libraryjars "$System.env.JAVA_HOME/jre/lib/rt.jar"
|
||||
libraryjars configurations["compile"]
|
||||
libraryjars configurations.named("resolvableImplementation")
|
||||
|
||||
dontobfuscate
|
||||
dontoptimize
|
||||
|
||||
+2
-2
@@ -37,8 +37,8 @@ if (isIrBackend) {
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
|
||||
integrationTestCompile files(file(compileKotlin2Js.kotlinOptions.outputFile).parent)
|
||||
integrationTestCompile "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
|
||||
integrationTestImplementation files(file(compileKotlin2Js.kotlinOptions.outputFile).parent)
|
||||
integrationTestImplementation "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
|
||||
}
|
||||
|
||||
task integrationTestJar(type: Jar) {
|
||||
|
||||
Reference in New Issue
Block a user