Build: Fix deprecated Gradle configurations usages

for migration to Gradle 7+ #KTI-559

libraries/examples/annotation-processor-example/build.gradle.kts

@@ -13,7 +13,7 @@ pill {
 }
 
 dependencies {
-    compile(kotlinStdlib())
+    api(kotlinStdlib())
 }
 
 sourceSets {

libraries/examples/kotlin-gradle-subplugin-example/build.gradle

@@ -12,11 +12,11 @@ pill {
 }
 
 dependencies {
-    compile project(':kotlin-gradle-plugin-api')
+    api project(':kotlin-gradle-plugin-api')
     // Use this dependency instead when building apart from the other modules:
     // compile "org.jetbrains.kotlin:kotlin-gradle-plugin-api:$kotlin_version"
 
-    compile project(':kotlin-test::kotlin-test-junit')
+    api project(':kotlin-test::kotlin-test-junit')
 
     compileOnly kotlinStdlib()
     compileOnly project(':compiler')

libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts

@@ -19,15 +19,15 @@ val compilerClasspath by configurations.creating {
 }
 
 dependencies {
-    testCompile(kotlinStdlib())
-    testCompile(project(":kotlin-script-runtime"))
-    testCompile(project(":kotlin-script-util"))
-    testCompile(projectRuntimeJar(":kotlin-daemon-client"))
-    testCompile(projectRuntimeJar(":kotlin-daemon-embeddable"))
-    testCompile(projectRuntimeJar(":kotlin-compiler-embeddable"))
-    testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-test:kotlin-test-junit"))
-    testRuntime(project(":kotlin-reflect"))
+    testApi(kotlinStdlib())
+    testApi(project(":kotlin-script-runtime"))
+    testApi(project(":kotlin-script-util"))
+    testApi(projectRuntimeJar(":kotlin-daemon-client"))
+    testApi(projectRuntimeJar(":kotlin-daemon-embeddable"))
+    testApi(projectRuntimeJar(":kotlin-compiler-embeddable"))
+    testApi(commonDep("junit:junit"))
+    testApi(project(":kotlin-test:kotlin-test-junit"))
+    testRuntimeOnly(project(":kotlin-reflect"))
     compilerClasspath(project(":kotlin-reflect"))
     compilerClasspath(kotlinStdlib())
     compilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j"))

libraries/examples/kotlin-jsr223-local-example/build.gradle.kts

@@ -12,18 +12,18 @@ pill {
 }
 
 dependencies {
-    compile(kotlinStdlib())
-    compile(project(":kotlin-script-runtime"))
-    compile(project(":kotlin-compiler-embeddable"))
-    compile(project(":kotlin-script-util"))
-    runtime(project(":kotlin-scripting-compiler-embeddable"))
-    testCompile(project(":kotlin-test:kotlin-test-junit"))
-    testCompile(commonDep("junit:junit"))
-    testRuntime(project(":kotlin-reflect"))
+    api(kotlinStdlib())
+    api(project(":kotlin-script-runtime"))
+    api(project(":kotlin-compiler-embeddable"))
+    api(project(":kotlin-script-util"))
+    runtimeOnly(project(":kotlin-scripting-compiler-embeddable"))
+    testApi(project(":kotlin-test:kotlin-test-junit"))
+    testApi(commonDep("junit:junit"))
+    testRuntimeOnly(project(":kotlin-reflect"))
     compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build)
     testCompileOnly(project(":core:util.runtime")) // TODO: fix import (workaround for jps build)
     testCompileOnly(project(":daemon-common")) // TODO: fix import (workaround for jps build)
-    testRuntime(project(":kotlin-scripting-compiler-embeddable"))
+    testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable"))
 }
 
 projectTest()

libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts

@@ -4,14 +4,14 @@ plugins {
 }
 
 dependencies {
-    compile(project(":examples:scripting-jvm-simple-script"))
+    api(project(":examples:scripting-jvm-simple-script"))
     compileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     testRuntimeOnly(project(":kotlin-compiler-embeddable"))
     testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable"))
     testRuntimeOnly(project(":kotlin-scripting-jvm-host"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
-    testCompile(commonDep("junit"))
+    testApi(commonDep("junit"))
 }
 
 sourceSets {

libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts

@@ -4,9 +4,9 @@ plugins {
 }
 
 dependencies {
-    compile(project(":examples:scripting-jvm-maven-deps"))
-    compile(project(":kotlin-scripting-jvm-host-unshaded"))
-    compile(kotlinStdlib())
+    api(project(":examples:scripting-jvm-maven-deps"))
+    api(project(":kotlin-scripting-jvm-host-unshaded"))
+    api(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(project(":compiler:util"))
 
@@ -14,7 +14,7 @@ dependencies {
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":kotlin-scripting-compiler"))
 
-    testCompile(commonDep("junit"))
+    testApi(commonDep("junit"))
 }
 
 sourceSets {

libraries/examples/scripting/jvm-maven-deps/script/build.gradle.kts

@@ -4,10 +4,10 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-scripting-jvm"))
-    compile(project(":kotlin-scripting-dependencies"))
-    compile(project(":kotlin-scripting-dependencies-maven"))
-    compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
+    api(project(":kotlin-scripting-jvm"))
+    api(project(":kotlin-scripting-dependencies"))
+    api(project(":kotlin-scripting-dependencies-maven"))
+    api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
 }
 
 sourceSets {

libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts

@@ -4,13 +4,13 @@ plugins {
 }
 
 dependencies {
-    compile(project(":examples:scripting-jvm-simple-script"))
-    compile(project(":kotlin-scripting-jvm-host-unshaded"))
-    compile(project(":kotlin-script-util"))
+    api(project(":examples:scripting-jvm-simple-script"))
+    api(project(":kotlin-scripting-jvm-host-unshaded"))
+    api(project(":kotlin-script-util"))
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntimeOnly(project(":kotlin-scripting-compiler"))
     testRuntimeOnly(project(":kotlin-reflect"))
-    testCompile(commonDep("junit"))
+    testApi(commonDep("junit"))
 }
 
 sourceSets {

libraries/examples/scripting/jvm-simple-script/script/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-scripting-jvm"))
+    api(project(":kotlin-scripting-jvm"))
 }
 
 sourceSets {

libraries/kotlin.test/annotations-common/build.gradle

@@ -5,8 +5,8 @@ apply plugin: 'kotlin-platform-common'
 JvmToolchain.updateJvmTarget(project, "1.6")
 
 dependencies {
-    compile kotlinStdlib("common")
-    testCompile project(":kotlin-test:kotlin-test-common")
+    api kotlinStdlib("common")
+    testApi project(":kotlin-test:kotlin-test-common")
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {

libraries/kotlin.test/common/build.gradle

@@ -5,8 +5,8 @@ apply plugin: 'kotlin-platform-common'
 JvmToolchain.updateJvmTarget(project, "1.6")
 
 dependencies {
-    compile kotlinStdlib("common")
-    testCompile project(":kotlin-test:kotlin-test-annotations-common")
+    api kotlinStdlib("common")
+    testApi project(":kotlin-test:kotlin-test-annotations-common")
 }
 
 jar {

libraries/kotlin.test/js/build.gradle

@@ -10,7 +10,7 @@ configurations {
 dependencies {
     expectedBy project(':kotlin-test:kotlin-test-common')
     expectedBy project(':kotlin-test:kotlin-test-annotations-common')
-    compile kotlinStdlib("js")
+    api kotlinStdlib("js")
 }
 
 compileKotlin2Js {
@@ -73,7 +73,6 @@ task sourcesJar(type: Jar, dependsOn: classes) {
 }
 
 artifacts {
-    runtime libraryJarWithIr
     archives libraryJarWithIr
     distLibrary libraryJarWithIr
     archives sourcesJar

libraries/kotlin.test/js/it/build.gradle

@@ -12,7 +12,7 @@ apply plugin: 'kotlin-platform-js'
 
 configurations {
     nodeModules {
-        extendsFrom compile
+        extendsFrom api
         attributes {
             attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, KotlinUsages.KOTLIN_RUNTIME))
             attribute(KotlinPlatformType.attribute, KotlinPlatformType.js)
@@ -21,7 +21,7 @@ configurations {
 }
 
 dependencies {
-    compile project(':kotlin-test:kotlin-test-js')
+    api project(':kotlin-test:kotlin-test-js')
 }
 
 // package.json contains direct links to the builddir

libraries/kotlin.test/junit/build.gradle

@@ -14,8 +14,8 @@ sourceSets {
 
 dependencies {
     expectedBy project(':kotlin-test:kotlin-test-annotations-common')
-    compile project(':kotlin-test:kotlin-test-jvm')
-    compile('junit:junit:4.12')
+    api project(':kotlin-test:kotlin-test-jvm')
+    api('junit:junit:4.12')
 }
 
 

libraries/kotlin.test/junit5/build.gradle

@@ -14,10 +14,10 @@ project.ext["jpsLibraryPath"] = rootProject.distLibDir
 
 dependencies {
     expectedBy project(':kotlin-test:kotlin-test-annotations-common')
-    compile project(':kotlin-test:kotlin-test-jvm')
+    api project(':kotlin-test:kotlin-test-jvm')
 
-    compile("org.junit.jupiter:junit-jupiter-api:5.0.0")
-    testRuntime("org.junit.jupiter:junit-jupiter-engine:5.2.0")
+    api("org.junit.jupiter:junit-jupiter-api:5.0.0")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.2.0")
 }
 
 jar {

libraries/kotlin.test/jvm/build.gradle

@@ -16,9 +16,9 @@ sourceSets {
 
 dependencies {
     expectedBy project(':kotlin-test:kotlin-test-common')
-    compile kotlinStdlib()
-    testCompile project(":kotlin-test:kotlin-test-junit")
-    testCompile('junit:junit:4.12')
+    api(kotlinStdlib())
+    testApi(project(":kotlin-test:kotlin-test-junit"))
+    testApi('junit:junit:4.12')
 }
 
 jar {

libraries/kotlin.test/testng/build.gradle

@@ -15,8 +15,8 @@ sourceSets {
 
 dependencies {
     expectedBy project(':kotlin-test:kotlin-test-annotations-common')
-    compile project(':kotlin-test:kotlin-test-jvm')
-    compile('org.testng:testng:6.13.1')
+    api project(':kotlin-test:kotlin-test-jvm')
+    api('org.testng:testng:6.13.1')
     if (includeJava9) {
         java9CompileOnly('org.testng:testng:7.0.0')
     }

libraries/kotlinx-metadata/build.gradle.kts

@@ -19,7 +19,7 @@ sourceSets {
 }
 
 dependencies {
-    compile(kotlinStdlib())
+    api(kotlinStdlib())
     compileOnly(project(":core:metadata"))
     compileOnly(protobufLite())
 }

libraries/kotlinx-metadata/jvm/build.gradle.kts

@@ -37,7 +37,7 @@ val shadows by configurations.creating {
     isTransitive = false
 }
 configurations.getByName("compileOnly").extendsFrom(shadows)
-configurations.getByName("testCompile").extendsFrom(shadows)
+configurations.getByName("testApi").extendsFrom(shadows)
 
 dependencies {
     api(kotlinStdlib())

libraries/kotlinx-metadata/klib/build.gradle.kts

@@ -25,10 +25,10 @@ val shadows by configurations.creating {
     isTransitive = false
 }
 configurations.getByName("compileOnly").extendsFrom(shadows)
-configurations.getByName("testCompile").extendsFrom(shadows)
+configurations.getByName("testApi").extendsFrom(shadows)
 
 dependencies {
-    compile(kotlinStdlib())
+    api(kotlinStdlib())
     shadows(project(":kotlinx-metadata"))
     shadows(project(":core:compiler.common"))
     shadows(project(":core:metadata"))

libraries/reflect/api/build.gradle

@@ -22,7 +22,7 @@ sourceSets {
 }
 
 dependencies {
-    compile kotlinStdlib()
+    api kotlinStdlib()
     compileOnly project(':core:descriptors')
     compileOnly project(':core:descriptors.jvm')
     compileOnly project(':core:deserialization')
@@ -69,5 +69,4 @@ task java9Jar(type: Jar) {
 
 artifacts {
     archives java9Jar
-    runtime java9Jar
 }

libraries/reflect/build.gradle.kts

@@ -17,7 +17,7 @@ buildscript {
 }
 
 plugins {
-    java
+    `java-library`
 }
 
 configureJavaOnlyToolchain(JdkMajorVersion.JDK_1_6)
@@ -35,10 +35,9 @@ val embedded by configurations
 embedded.isTransitive = false
 
 configurations.getByName("compileOnly").extendsFrom(embedded)
-val mainJar by configurations.creating
 
 dependencies {
-    compile(kotlinStdlib())
+    api(kotlinStdlib())
 
     proguardDeps(kotlinStdlib())
     proguardAdditionalInJars(project(":kotlin-annotations-jvm"))
@@ -256,8 +255,8 @@ dexMethodCount {
 }
 
 artifacts {
-    listOf(mainJar.name, "runtime", "archives", "runtimeElements").forEach { configurationName ->
-        add(configurationName, result.get().outputs.files.singleFile) {
+    listOf("archives", "runtimeElements").forEach { configurationName ->
+        add(configurationName, provider { result.get().outputs.files.singleFile }) {
             builtBy(result)
         }
     }

libraries/scripting/common/build.gradle.kts

@@ -6,9 +6,9 @@ plugins {
 project.updateJvmTarget("1.6")
 
 dependencies {
-    compile(kotlinStdlib())
+    api(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
-    testCompile(commonDep("junit"))
+    testApi(commonDep("junit"))
 }
 
 sourceSets {

libraries/scripting/dependencies/build.gradle.kts

@@ -6,9 +6,9 @@ plugins {
 project.updateJvmTarget("1.6")
 
 dependencies {
-    compile(kotlinStdlib())
-    compile(project(":kotlin-scripting-common"))
-    testCompile(commonDep("junit"))
+    api(kotlinStdlib())
+    api(project(":kotlin-scripting-common"))
+    testApi(commonDep("junit"))
     testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
 }
 

libraries/scripting/intellij/build.gradle.kts

@@ -5,9 +5,9 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-script-runtime"))
-    compile(kotlinStdlib())
-    compile(project(":kotlin-scripting-common"))
+    api(project(":kotlin-script-runtime"))
+    api(kotlinStdlib())
+    api(project(":kotlin-scripting-common"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 

libraries/scripting/js-test/build.gradle.kts

@@ -5,16 +5,16 @@ plugins {
 val embeddableTestRuntime by configurations.creating
 
 dependencies {
-    testCompile(commonDep("junit"))
+    testApi(commonDep("junit"))
 
-    testCompile(project(":kotlin-scripting-js"))
-    testCompile(project(":compiler:plugin-api"))
-    testCompile(project(":kotlin-scripting-compiler"))
-    testCompile(project(":compiler:cli"))
-    testCompile(project(":compiler:backend.js"))
-    testCompile(project(":compiler:ir.tree.impl"))
-    testCompile(project(":js:js.engines"))
-    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
+    testApi(project(":kotlin-scripting-js"))
+    testApi(project(":compiler:plugin-api"))
+    testApi(project(":kotlin-scripting-compiler"))
+    testApi(project(":compiler:cli"))
+    testApi(project(":compiler:backend.js"))
+    testApi(project(":compiler:ir.tree.impl"))
+    testApi(project(":js:js.engines"))
+    testApi(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntimeOnly(intellijDep()) {
         includeJars("idea", "idea_rt", "log4j", "guava", "jdom", rootProject = rootProject)

libraries/scripting/js/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-scripting-common"))
+    api(project(":kotlin-scripting-common"))
     compileOnly(project(":compiler:backend.js"))
     compileOnly(project(":compiler:cli-common"))
     compileOnly(project(":js:js.engines"))

libraries/scripting/jsr223-test/build.gradle.kts

@@ -11,7 +11,7 @@ val embeddableTestRuntime by configurations.creating {
 }
 
 dependencies {
-    testCompile(commonDep("junit"))
+    testApi(commonDep("junit"))
     testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     testCompileOnly(project(":compiler:cli"))
     testCompileOnly(project(":core:util.runtime"))

libraries/scripting/jsr223/build.gradle.kts

@@ -6,12 +6,12 @@ plugins {
 publish()
 
 dependencies {
-    compile(project(":kotlin-script-runtime"))
-    compile(kotlinStdlib())
-    compile(project(":kotlin-scripting-common"))
-    compile(project(":kotlin-scripting-jvm"))
-    compile(project(":kotlin-scripting-jvm-host-unshaded"))
-    compile(project(":kotlin-scripting-compiler"))
+    api(project(":kotlin-script-runtime"))
+    api(kotlinStdlib())
+    api(project(":kotlin-scripting-common"))
+    api(project(":kotlin-scripting-jvm"))
+    api(project(":kotlin-scripting-jvm-host-unshaded"))
+    api(project(":kotlin-scripting-compiler"))
     compileOnly(project(":compiler:cli-common"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep())

libraries/scripting/jvm-host-test/build.gradle.kts

@@ -4,8 +4,8 @@ plugins {
 }
 
 val allTestsRuntime by configurations.creating
-val testCompile by configurations
-testCompile.extendsFrom(allTestsRuntime)
+val testApi by configurations
+testApi.extendsFrom(allTestsRuntime)
 val embeddableTestRuntime by configurations.creating {
     extendsFrom(allTestsRuntime)
 }
@@ -14,10 +14,10 @@ dependencies {
     allTestsRuntime(commonDep("junit"))
     allTestsRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") }
-    testCompile(project(":kotlin-scripting-jvm-host-unshaded"))
-    testCompile(projectTests(":compiler:tests-common"))
-    testCompile(project(":kotlin-scripting-compiler"))
-    testCompile(project(":daemon-common")) // TODO: fix import (workaround for jps build)
+    testApi(project(":kotlin-scripting-jvm-host-unshaded"))
+    testApi(projectTests(":compiler:tests-common"))
+    testApi(project(":kotlin-scripting-compiler"))
+    testApi(project(":daemon-common")) // TODO: fix import (workaround for jps build)
     testImplementation(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
 
     testRuntimeOnly(project(":kotlin-compiler"))

libraries/scripting/jvm-host/build.gradle.kts

@@ -7,10 +7,10 @@ plugins {
 publish()
 
 dependencies {
-    compile(project(":kotlin-script-runtime"))
-    compile(kotlinStdlib())
-    compile(project(":kotlin-scripting-common"))
-    compile(project(":kotlin-scripting-jvm"))
+    api(project(":kotlin-script-runtime"))
+    api(kotlinStdlib())
+    api(project(":kotlin-scripting-common"))
+    api(project(":kotlin-scripting-jvm"))
     compileOnly(project(":kotlin-scripting-compiler"))
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":kotlin-reflect-api"))

libraries/scripting/jvm/build.gradle.kts

@@ -6,10 +6,10 @@ plugins {
 project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
 
 dependencies {
-    compile(project(":kotlin-script-runtime"))
-    compile(kotlinStdlib())
-    compile(project(":kotlin-scripting-common"))
-    testCompile(commonDep("junit"))
+    api(project(":kotlin-script-runtime"))
+    api(kotlinStdlib())
+    api(project(":kotlin-scripting-common"))
+    testApi(commonDep("junit"))
 }
 
 sourceSets {

libraries/stdlib/common/build.gradle

@@ -26,8 +26,8 @@ sourceSets {
 }
 
 dependencies {
-    testCompile project(":kotlin-test:kotlin-test-common")
-    testCompile project(":kotlin-test:kotlin-test-annotations-common")
+    testApi project(":kotlin-test:kotlin-test-common")
+    testApi project(":kotlin-test:kotlin-test-annotations-common")
 }
 
 compileKotlinCommon {

libraries/stdlib/jdk7/build.gradle

@@ -38,12 +38,12 @@ sourceSets {
 }
 
 configurations {
-    noJdk7TestCompile.extendsFrom(testCompile)
+    noJdk7TestApi.extendsFrom(testApi)
 }
 
 dependencies {
-    compile project(':kotlin-stdlib')
-    testCompile project(':kotlin-test:kotlin-test-junit')
+    api project(':kotlin-stdlib')
+    testApi project(':kotlin-test:kotlin-test-junit')
 }
 
 jar {

libraries/stdlib/jdk8/build.gradle

@@ -7,9 +7,9 @@ configureSourcesJar()
 configureJavadocJar()
 
 dependencies {
-    compile project(':kotlin-stdlib')
-    compile project(':kotlin-stdlib-jdk7')
-    testCompile project(':kotlin-test:kotlin-test-junit')
+    api project(':kotlin-stdlib')
+    api project(':kotlin-stdlib-jdk7')
+    testApi project(':kotlin-test:kotlin-test-junit')
 }
 
 sourceSets {

libraries/stdlib/js-v1/build.gradle

@@ -68,7 +68,7 @@ sourceSets {
 dependencies {
     expectedBy project(":kotlin-stdlib-common")
     commonSources project(path: ":kotlin-stdlib-common", configuration: "sources")
-    testCompile project(':kotlin-test:kotlin-test-js')
+    testApi project(':kotlin-test:kotlin-test-js')
 }
 
 task prepareComparableSource(type: Copy) {
@@ -322,7 +322,6 @@ task distSourcesJar(type: Jar) {
 }
 
 artifacts {
-    runtime libraryJarWithIr
     publishedRuntime libraryJarWithIr
     publishedRuntime sourcesJar
     sources sourcesJar

libraries/stdlib/jvm-minimal-for-test/build.gradle.kts

@@ -17,11 +17,6 @@ val builtins by configurations.creating {
     }
 }
 
-val runtime by configurations
-val runtimeJar by configurations.creating {
-    runtime.extendsFrom(this)
-}
-
 dependencies {
     compileOnly(project(":kotlin-stdlib"))
     builtins(project(":core:builtins"))

libraries/stdlib/jvm/build.gradle

@@ -50,6 +50,7 @@ configurations {
         }
     }
     compileOnly.extendsFrom(builtins)
+    testCompileOnly.extendsFrom(builtins)
 }
 
 dependencies {
@@ -57,9 +58,9 @@ dependencies {
 
     commonSources project(path: ":kotlin-stdlib-common", configuration: "sources")
 
-    compile group: 'org.jetbrains', name: 'annotations', version:'13.0'
+    api group: 'org.jetbrains', name: 'annotations', version:'13.0'
 
-    testCompile project(':kotlin-test:kotlin-test-junit')
+    testApi project(':kotlin-test:kotlin-test-junit')
 
     builtins project(':core:builtins')
 }

libraries/stdlib/samples/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'kotlin'
 
 dependencies {
-    compile project(':kotlin-stdlib-jdk8')
-    testCompile project(':kotlin-test:kotlin-test-junit')
+    api project(':kotlin-stdlib-jdk8')
+    testApi project(':kotlin-test:kotlin-test-junit')
 }
 
 sourceSets {

libraries/tools/binary-compatibility-validator/build.gradle

@@ -6,9 +6,9 @@ configurations {
 }
 
 dependencies {
-    compile("org.jetbrains.kotlinx:binary-compatibility-validator:0.7.1")
+    api("org.jetbrains.kotlinx:binary-compatibility-validator:0.7.1")
 
-    testCompile project(':kotlin-test:kotlin-test-junit')
+    testApi project(':kotlin-test:kotlin-test-junit')
 
     testArtifacts project(':kotlin-stdlib')
     testArtifacts project(':kotlin-stdlib-jdk7')

libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts

@@ -5,9 +5,9 @@ plugins {
 }
 
 dependencies {
-    compile(gradleApi())
-    compile(project(":kotlin-gradle-plugin-api"))
-    compile(project(":native:kotlin-native-utils"))
+    api(gradleApi())
+    api(project(":kotlin-gradle-plugin-api"))
+    api(project(":native:kotlin-native-utils"))
 }
 
 val generateMppTargetContainerWithPresets by generator(

libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts

@@ -9,7 +9,9 @@ import org.gradle.jvm.tasks.Jar
 
 description = "Shaded test jars from compiler for Gradle integration tests"
 
-plugins { `java` }
+plugins {
+    `java-library`
+}
 
 val packedJars by configurations.creating
 
@@ -22,7 +24,7 @@ val projectsToInclude = listOf(
 
 dependencies {
     for (projectName in projectsToInclude) {
-        compile(projectTests(projectName)) { isTransitive = false }
+        api(projectTests(projectName)) { isTransitive = false }
         packedJars(projectTests(projectName)) { isTransitive = false }
     }
 

libraries/tools/kotlin-gradle-plugin/build.gradle.kts

@@ -102,7 +102,7 @@ dependencies {
 }
 
 if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
-    configurations.compile.get().exclude("com.android.tools.external.com-intellij", "intellij-core")
+    configurations.api.get().exclude("com.android.tools.external.com-intellij", "intellij-core")
 }
 
 noDefaultJar()

libraries/tools/kotlin-main-kts-test/build.gradle.kts

@@ -6,13 +6,13 @@ plugins {
 }
 
 dependencies {
-    testCompile(project(":kotlin-main-kts"))
+    testApi(project(":kotlin-main-kts"))
     testCompileOnly(project(":compiler:cli"))
     testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
-    testCompile(kotlinStdlib("jdk8"))
-    testCompile(commonDep("junit"))
-    testCompile(projectTests(":kotlin-scripting-compiler")) { isTransitive = false }
-    testRuntime(project(":kotlin-compiler-embeddable"))
+    testApi(kotlinStdlib("jdk8"))
+    testApi(commonDep("junit"))
+    testApi(projectTests(":kotlin-scripting-compiler")) { isTransitive = false }
+    testImplementation(project(":kotlin-compiler-embeddable"))
 }
 
 sourceSets {

libraries/tools/kotlin-main-kts/build.gradle.kts

@@ -17,7 +17,8 @@ val localPackagesToRelocate =
 
 val proguardLibraryJars by configurations.creating {
     attributes {
-        attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_API))
+        attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
+        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR))
     }
 }
 
@@ -120,7 +121,7 @@ val resultJar by task<Jar> {
     }
 }
 
-addArtifact("runtime", resultJar)
+addArtifact("apiElements", resultJar)
 addArtifact("runtimeElements", resultJar)
 addArtifact("archives", resultJar)
 

libraries/tools/kotlin-noarg/build.gradle

@@ -14,8 +14,8 @@ dependencies {
     compileOnly project(':compiler')
     compileOnly project(':kotlin-noarg-compiler-plugin')
 
-    testCompile gradleApi()
-    testCompile "junit:junit:4.12"
+    testApi gradleApi()
+    testApi "junit:junit:4.12"
 
     embedded(project(":kotlin-noarg-compiler-plugin")) { transitive = false }
 }

libraries/tools/kotlin-sam-with-receiver/build.gradle

@@ -14,8 +14,8 @@ dependencies {
     compileOnly project(':compiler')
     compileOnly project(':kotlin-sam-with-receiver-compiler-plugin')
 
-    testCompile gradleApi()
-    testCompile "junit:junit:4.12"
+    testApi gradleApi()
+    testApi "junit:junit:4.12"
 
     embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { transitive = false }
 }

libraries/tools/kotlin-script-util/build.gradle.kts

@@ -7,29 +7,29 @@ plugins {
 }
 
 dependencies {
-    compile(kotlinStdlib())
-    compile(project(":kotlin-script-runtime"))
-    compile(project(":kotlin-scripting-jvm"))
-    compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))
+    api(kotlinStdlib())
+    api(project(":kotlin-script-runtime"))
+    api(project(":kotlin-scripting-jvm"))
+    api(commonDep("org.jetbrains.intellij.deps", "trove4j"))
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":daemon-common"))
     compileOnly(project(":kotlin-scripting-compiler"))
-    compile(projectRuntimeJar(":kotlin-daemon-client"))
+    api(projectRuntimeJar(":kotlin-daemon-client"))
     compileOnly("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
     compileOnly("org.sonatype.aether:aether-api:1.13.1")
     compileOnly("org.apache.maven:maven-core:3.0.3")
     testCompileOnly(project(":compiler:cli"))
-    testCompile(project(":kotlin-test:kotlin-test-junit"))
-    testRuntime(project(":kotlin-reflect"))
-    testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-scripting-compiler"))
+    testApi(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(project(":kotlin-reflect"))
+    testApi(commonDep("junit:junit"))
+    testApi(project(":kotlin-scripting-compiler"))
     testRuntimeOnly(project(":kotlin-compiler"))
-    testRuntime("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
-    testRuntime("org.sonatype.aether:aether-api:1.13.1")
-    testRuntime("org.apache.maven:maven-core:3.0.3")
+    testImplementation("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
+    testImplementation("org.sonatype.aether:aether-api:1.13.1")
+    testImplementation("org.apache.maven:maven-core:3.0.3")
     compileOnly(intellijDep()) { includeJars("util") }
-    testCompile(intellijDep()) { includeJars("platform-api", "util") }
-    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
+    testApi(intellijDep()) { includeJars("platform-api", "util") }
+    testApi(intellijCoreDep()) { includeJars("intellij-core") }
 
 }
 

libraries/tools/kotlin-serialization/build.gradle

@@ -9,7 +9,7 @@ pill {
 
 dependencies {
     compileOnly project(':kotlin-gradle-plugin')
-    compile project(':kotlin-gradle-plugin-api')
+    api project(':kotlin-gradle-plugin-api')
 
     compileOnly kotlinStdlib()
     compileOnly project(path: ':kotlin-compiler-embeddable', configuration: 'runtimeJar')

libraries/tools/kotlin-stdlib-gen/build.gradle

@@ -8,8 +8,8 @@ sourceSets {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$bootstrapKotlinVersion"
+    api "org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion"
+    api "org.jetbrains.kotlin:kotlin-reflect:$bootstrapKotlinVersion"
 }
 
 compileKotlin {

libraries/tools/script-runtime/build.gradle

@@ -10,10 +10,6 @@ dependencies {
     compileOnly kotlinStdlib()
 }
 
-configurations {
-    mainJar
-}
-
 sourceSets {
     main {
         kotlin {
@@ -26,10 +22,6 @@ jar {
     manifestAttributes(manifest, project, 'Main')
 }
 
-artifacts {
-    mainJar jar
-}
-
 configureSourcesJar()
 configureJavadocJar()