Build: Fix deprecated Gradle configurations usages
for migration to Gradle 7+ #KTI-559
This commit is contained in:
@@ -13,7 +13,7 @@ pill {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(kotlinStdlib())
|
||||
api(kotlinStdlib())
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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"))
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -4,7 +4,7 @@ plugins {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlin-scripting-jvm"))
|
||||
api(project(":kotlin-scripting-jvm"))
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
Reference in New Issue
Block a user