azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Fix deprecated Gradle configurations usages

Browse Source 
for migration to Gradle 7+ #KTI-559
This commit is contained in:
Vyacheslav Gerasimov
2021-07-07 00:27:29 +03:00
parent dbedff3c62
commit ab146bd6d4
158 changed files with 867 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/common/build.gradle.kts
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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
+9 -9
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 -6
View File
@@ -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
+6 -6
View File
@@ -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
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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 {