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
compiler/cli/build.gradle.kts
+30 -30
View File
@@ -4,35 +4,35 @@ plugins {
}
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:cli-common"))
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:frontend:cfg"))
compile(project(":compiler:backend-common"))
compile(project(":compiler:backend"))
compile(project(":compiler:backend.jvm"))
api(project(":compiler:util"))
api(project(":compiler:cli-common"))
api(project(":compiler:frontend"))
api(project(":compiler:frontend.java"))
api(project(":compiler:frontend:cfg"))
api(project(":compiler:backend-common"))
api(project(":compiler:backend"))
api(project(":compiler:backend.jvm"))
implementation(project(":compiler:backend.jvm.lower"))
implementation(project(":compiler:backend.jvm.entrypoint"))
compile(project(":compiler:ir.backend.common"))
compile(project(":compiler:light-classes"))
compile(project(":compiler:serialization"))
compile(project(":compiler:plugin-api"))
compile(project(":compiler:javac-wrapper"))
compile(project(":js:js.translator"))
compile(project(":native:frontend.native"))
compile(commonDep("org.fusesource.jansi", "jansi"))
compile(commonDep("org.jline", "jline"))
compile(project(":compiler:fir:raw-fir:psi2fir"))
compile(project(":compiler:fir:resolve"))
compile(project(":compiler:fir:java"))
api(project(":compiler:ir.backend.common"))
api(project(":compiler:light-classes"))
api(project(":compiler:serialization"))
api(project(":compiler:plugin-api"))
api(project(":compiler:javac-wrapper"))
api(project(":js:js.translator"))
api(project(":native:frontend.native"))
api(commonDep("org.fusesource.jansi", "jansi"))
api(commonDep("org.jline", "jline"))
api(project(":compiler:fir:raw-fir:psi2fir"))
api(project(":compiler:fir:resolve"))
api(project(":compiler:fir:java"))
implementation(project(":compiler:fir:entrypoint"))
compile(project(":compiler:fir:fir2ir"))
compile(project(":compiler:fir:fir2ir:jvm-backend"))
compile(project(":compiler:fir:checkers"))
compile(project(":compiler:fir:checkers:checkers.jvm"))
compile(project(":kotlin-util-klib"))
compile(project(":kotlin-util-io"))
api(project(":compiler:fir:fir2ir"))
api(project(":compiler:fir:fir2ir:jvm-backend"))
api(project(":compiler:fir:checkers"))
api(project(":compiler:fir:checkers:checkers.jvm"))
api(project(":kotlin-util-klib"))
api(project(":kotlin-util-io"))
// TODO: as soon as cli-jvm is extracted out of this module, move this dependency there
compileOnly(project(":compiler:ir.tree.impl"))
@@ -41,10 +41,10 @@ dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
testCompile(project(":compiler:backend"))
testCompile(project(":compiler:cli"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testApi(project(":compiler:backend"))
testApi(project(":compiler:cli"))
testApi(projectTests(":compiler:tests-common"))
testApi(commonDep("junit:junit"))
}
sourceSets {
compiler/cli/cli-common/build.gradle.kts
+5 -5
View File
@@ -4,11 +4,11 @@ plugins {
}
dependencies {
compile(project(":core:util.runtime"))
compile(project(":compiler:config"))
compile(project(":compiler:config.jvm"))
compile(project(":js:js.config"))
compile(project(":native:kotlin-native-utils"))
api(project(":core:util.runtime"))
api(project(":compiler:config"))
api(project(":compiler:config.jvm"))
api(project(":js:js.config"))
api(project(":native:kotlin-native-utils"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
compiler/cli/cli-js/build.gradle.kts
+14 -14
View File
@@ -4,20 +4,20 @@ plugins {
}
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:cli-common"))
compile(project(":compiler:cli"))
compile(project(":compiler:frontend"))
compile(project(":compiler:backend-common"))
compile(project(":compiler:ir.backend.common"))
compile(project(":compiler:ir.serialization.js"))
compile(project(":compiler:ir.tree.impl"))
compile(project(":compiler:backend.js"))
compile(project(":compiler:backend.wasm"))
compile(project(":js:js.translator"))
compile(project(":js:js.serializer"))
compile(project(":js:js.dce"))
compile(project(":js:js.sourcemap"))
api(project(":compiler:util"))
api(project(":compiler:cli-common"))
api(project(":compiler:cli"))
api(project(":compiler:frontend"))
api(project(":compiler:backend-common"))
api(project(":compiler:ir.backend.common"))
api(project(":compiler:ir.serialization.js"))
api(project(":compiler:ir.tree.impl"))
api(project(":compiler:backend.js"))
api(project(":compiler:backend.wasm"))
api(project(":js:js.translator"))
api(project(":js:js.serializer"))
api(project(":js:js.dce"))
api(project(":js:js.sourcemap"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
compiler/cli/cli-runner/build.gradle.kts
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
}
dependencies {
compile(kotlinStdlib())
api(kotlinStdlib())
}
sourceSets {