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
js/js.ast/build.gradle.kts
+1 -1
View File
@@ -4,7 +4,7 @@ plugins {
}
dependencies {
compile(project(":core:descriptors"))
api(project(":core:descriptors"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("trove4j") }
}
js/js.dce/build.gradle.kts
+3 -3
View File
@@ -5,9 +5,9 @@ plugins {
}
dependencies {
compile(project(":compiler:util"))
compile(project(":js:js.ast"))
compile(project(":js:js.translator"))
api(project(":compiler:util"))
api(project(":js:js.ast"))
api(project(":js:js.translator"))
compileOnly(project(":js:js.sourcemap"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
js/js.engines/build.gradle.kts
+4 -4
View File
@@ -5,10 +5,10 @@ plugins {
}
dependencies {
compile(project(":compiler:util"))
compile(project(":js:js.ast"))
compile(project(":js:js.translator"))
compile(intellijCoreDep()) { includeJars("intellij-core") }
api(project(":compiler:util"))
api(project(":js:js.ast"))
api(project(":js:js.translator"))
api(intellijCoreDep()) { includeJars("intellij-core") }
}
sourceSets {
js/js.frontend/build.gradle.kts
+6 -6
View File
@@ -4,12 +4,12 @@ plugins {
}
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compile(project(":js:js.ast"))
compile(project(":js:js.parser"))
compile(project(":js:js.serializer"))
compile(project(":js:js.config"))
api(project(":compiler:util"))
api(project(":compiler:frontend"))
api(project(":js:js.ast"))
api(project(":js:js.parser"))
api(project(":js:js.serializer"))
api(project(":js:js.config"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
}
js/js.parser/build.gradle.kts
+1 -1
View File
@@ -5,7 +5,7 @@ plugins {
dependencies {
api(kotlinStdlib())
compile(project(":js:js.ast"))
api(project(":js:js.ast"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
js/js.serializer/build.gradle.kts
+5 -5
View File
@@ -4,11 +4,11 @@ plugins {
}
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compile(project(":compiler:serialization"))
compile(project(":js:js.ast"))
compile(project(":js:js.config"))
api(project(":compiler:util"))
api(project(":compiler:frontend"))
api(project(":compiler:serialization"))
api(project(":js:js.ast"))
api(project(":js:js.config"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
}
js/js.tests/build.gradle.kts
+24 -24
View File
@@ -27,45 +27,45 @@ val testJsRuntime by configurations.creating {
}
dependencies {
testRuntime(intellijDep())
testRuntimeOnly(intellijDep())
testCompile(protobufFull())
testCompile(projectTests(":compiler:tests-common"))
testApi(protobufFull())
testApi(projectTests(":compiler:tests-common"))
testCompileOnly(project(":compiler:frontend"))
testCompileOnly(project(":compiler:cli"))
testCompileOnly(project(":compiler:cli-js"))
testCompileOnly(project(":compiler:util"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "util") }
testCompile(project(":compiler:backend.js"))
testCompile(project(":compiler:backend.wasm"))
testCompile(project(":js:js.translator"))
testCompile(project(":js:js.serializer"))
testCompile(project(":js:js.dce"))
testCompile(project(":js:js.engines"))
testCompile(project(":compiler:incremental-compilation-impl"))
testCompile(commonDep("junit:junit"))
testCompile(projectTests(":kotlin-build-common"))
testCompile(projectTests(":generators:test-generator"))
testApi(project(":compiler:backend.js"))
testApi(project(":compiler:backend.wasm"))
testApi(project(":js:js.translator"))
testApi(project(":js:js.serializer"))
testApi(project(":js:js.dce"))
testApi(project(":js:js.engines"))
testApi(project(":compiler:incremental-compilation-impl"))
testApi(commonDep("junit:junit"))
testApi(projectTests(":kotlin-build-common"))
testApi(projectTests(":generators:test-generator"))
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(project(":compiler:frontend"))
testCompile(project(":compiler:cli"))
testCompile(project(":compiler:util"))
testApi(intellijCoreDep()) { includeJars("intellij-core") }
testApi(project(":compiler:frontend"))
testApi(project(":compiler:cli"))
testApi(project(":compiler:util"))
testRuntime(project(":kotlin-reflect"))
testRuntimeOnly(project(":kotlin-reflect"))
testRuntime(intellijDep()) { includeJars("trove4j", "guava", "jdom", rootProject = rootProject) }
testRuntimeOnly(intellijDep()) { includeJars("trove4j", "guava", "jdom", rootProject = rootProject) }
testRuntime(kotlinStdlib())
testRuntimeOnly(kotlinStdlib())
testJsRuntime(kotlinStdlib("js"))
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
testJsRuntime(project(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned
}
testRuntime(project(":kotlin-reflect"))
testRuntime(project(":kotlin-preloader")) // it's required for ant tests
testRuntime(project(":compiler:backend-common"))
testRuntime(commonDep("org.fusesource.jansi", "jansi"))
testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(project(":kotlin-preloader")) // it's required for ant tests
testRuntimeOnly(project(":compiler:backend-common"))
testRuntimeOnly(commonDep("org.fusesource.jansi", "jansi"))
antLauncherJar(commonDep("org.apache.ant", "ant"))
antLauncherJar(toolsJar())
js/js.translator/build.gradle.kts
+7 -7
View File
@@ -7,13 +7,13 @@ plugins {
}
dependencies {
compile(project(":core:descriptors"))
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compile(project(":compiler:backend-common"))
compile(project(":js:js.ast"))
compile(project(":js:js.frontend"))
compile(project(":js:js.parser"))
api(project(":core:descriptors"))
api(project(":compiler:util"))
api(project(":compiler:frontend"))
api(project(":compiler:backend-common"))
api(project(":js:js.ast"))
api(project(":js:js.frontend"))
api(project(":js:js.parser"))
compileOnly(project(":js:js.sourcemap"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }