diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt index 9ac4a786f32..31f4f18a4a9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt @@ -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 }" } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt index 11582abb572..6276fb29734 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt @@ -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() } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyInterop/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyInterop/build.gradle index c4b843f693f..69e97456ef9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyInterop/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyInterop/build.gradle @@ -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 { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyInterop/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyInterop/lib/build.gradle index 7c96c3e8bce..352e9b3b9e4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyInterop/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyInterop/lib/build.gradle @@ -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' } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/interopWithProguarded/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/interopWithProguarded/lib/build.gradle index 014c498457d..b590d5113b4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/interopWithProguarded/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/interopWithProguarded/lib/build.gradle @@ -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 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithCustomSourceset/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithCustomSourceset/build.gradle index 836f71db154..ebddcecaa34 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithCustomSourceset/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithCustomSourceset/build.gradle @@ -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) {