Fix test project uses removed configuration for dependencies.

^KT-44949 In Progress
This commit is contained in:
Yahor Berdnikau
2021-02-19 17:41:48 +01:00
parent d78f579a42
commit 2042508df0
6 changed files with 16 additions and 13 deletions
@@ -262,7 +262,7 @@ open class Kapt3IT : Kapt3BaseIT() {
fun testChangeClasspathICRebuild() { fun testChangeClasspathICRebuild() {
testICRebuild { project -> testICRebuild { project ->
project.projectFile("build.gradle").modify { 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 }"
} }
} }
} }
@@ -126,9 +126,9 @@ class SimpleKotlinGradleIT : BaseGradleIT() {
@Test @Test
fun testGroovyInterop() { fun testGroovyInterop() {
Project("groovyInterop").build("build") { Project("groovyInterop").build("build") {
assertSuccessful()
assertTasksExecuted(":test") assertTasksExecuted(":test")
assertContains("GroovyInteropTest PASSED") assertContains("GroovyInteropTest PASSED")
assertSuccessful()
} }
} }
@@ -137,9 +137,9 @@ class SimpleKotlinGradleIT : BaseGradleIT() {
@Test @Test
fun testInteropWithProguarded() { fun testInteropWithProguarded() {
Project("interopWithProguarded").build("build") { Project("interopWithProguarded").build("build") {
assertSuccessful()
assertTasksExecuted(":test") assertTasksExecuted(":test")
assertContains("InteropWithProguardedTest PASSED") assertContains("InteropWithProguardedTest PASSED")
assertSuccessful()
} }
} }
@@ -17,10 +17,10 @@ repositories {
} }
dependencies { dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
testImplementation'junit:junit:4.12' testImplementation'junit:junit:4.12'
compile project(":lib") implementation project(":lib")
} }
compileKotlin { compileKotlin {
@@ -1,9 +1,10 @@
apply plugin: "groovy" apply plugin: "groovy"
apply plugin: "java-library"
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile 'org.codehaus.groovy:groovy-all:2.5.3' api 'org.codehaus.groovy:groovy-all:2.5.3'
} }
@@ -17,16 +17,18 @@ repositories {
mavenCentral() mavenCentral()
} }
dependencies { configurations {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" resolvableImplementation {
extendsFrom(findByName("implementation"))
canBeResolved = true
}
} }
task obfuscate(type: proguard.gradle.ProGuardTask, dependsOn: jar) { task obfuscate(type: proguard.gradle.ProGuardTask, dependsOn: jar) {
injars "${jar.archivePath}" injars "${jar.archivePath}"
outjars "$buildDir/proguard/out.jar" outjars "$buildDir/proguard/out.jar"
libraryjars "$System.env.JAVA_HOME/jre/lib/rt.jar" libraryjars "$System.env.JAVA_HOME/jre/lib/rt.jar"
libraryjars configurations["compile"] libraryjars configurations.named("resolvableImplementation")
dontobfuscate dontobfuscate
dontoptimize dontoptimize
@@ -37,8 +37,8 @@ if (isIrBackend) {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
integrationTestCompile files(file(compileKotlin2Js.kotlinOptions.outputFile).parent) integrationTestImplementation files(file(compileKotlin2Js.kotlinOptions.outputFile).parent)
integrationTestCompile "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version" integrationTestImplementation "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
} }
task integrationTestJar(type: Jar) { task integrationTestJar(type: Jar) {