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/daemon/build.gradle.kts
+2 -2
View File
@@ -8,8 +8,8 @@ plugins {
val ktorExcludesForDaemon : List<Pair<String, String>> by rootProject.extra
dependencies {
compile(commonDep("org.fusesource.jansi", "jansi"))
compile(commonDep("org.jline", "jline"))
api(commonDep("org.fusesource.jansi", "jansi"))
api(commonDep("org.jline", "jline"))
compileOnly(project(":compiler:cli"))
compileOnly(project(":compiler:cli-js"))
compiler/daemon/daemon-client-new/build.gradle.kts
+2 -2
View File
@@ -37,10 +37,10 @@ dependencies {
nativePlatformVariants.forEach {
embedded(commonDep("net.rubygrapefruit", "native-platform", "-$it"))
}
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
isTransitive = false
}
compile(commonDep("io.ktor", "ktor-network")) {
api(commonDep("io.ktor", "ktor-network")) {
ktorExcludesForDaemon.forEach { (group, module) ->
exclude(group = group, module = module)
}
compiler/daemon/daemon-common-new/build.gradle.kts
+3 -3
View File
@@ -8,13 +8,13 @@ val ktorExcludesForDaemon: List<Pair<String, String>> by rootProject.extra
dependencies {
compileOnly(project(":daemon-common"))
compile(kotlinStdlib())
api(kotlinStdlib())
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
isTransitive = false
}
compile(commonDep("io.ktor", "ktor-network")) {
api(commonDep("io.ktor", "ktor-network")) {
ktorExcludesForDaemon.forEach { (group, module) ->
exclude(group = group, module = module)
}
compiler/daemon/daemon-common/build.gradle.kts
+4 -4
View File
@@ -4,13 +4,13 @@ plugins {
}
dependencies {
compile(project(":compiler:cli-common"))
compile(project(":kotlin-build-common"))
compile(kotlinStdlib())
api(project(":compiler:cli-common"))
api(project(":kotlin-build-common"))
api(kotlinStdlib())
compileOnly(project(":js:js.config"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
isTransitive = false
}
}
compiler/daemon/daemon-tests/build.gradle.kts
+10 -10
View File
@@ -9,23 +9,23 @@ plugins {
val ktorExcludesForDaemon: List<Pair<String, String>> by rootProject.extra
dependencies {
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(kotlinStdlib())
testCompile(commonDep("junit:junit"))
testApi(project(":kotlin-test:kotlin-test-jvm"))
testApi(kotlinStdlib())
testApi(commonDep("junit:junit"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
testCompile(projectRuntimeJar(":kotlin-daemon-client"))
testCompile(projectRuntimeJar(":kotlin-daemon-client-new"))
testApi(projectRuntimeJar(":kotlin-daemon-client"))
testApi(projectRuntimeJar(":kotlin-daemon-client-new"))
testCompileOnly(project(":kotlin-daemon"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
testCompile(commonDep("io.ktor", "ktor-network")) {
testApi(projectTests(":compiler:tests-common"))
testApi(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
testApi(commonDep("io.ktor", "ktor-network")) {
ktorExcludesForDaemon.forEach { (group, module) ->
exclude(group = group, module = module)
}
}
testRuntime(project(":kotlin-daemon"))
testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
testImplementation(project(":kotlin-daemon"))
testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
}
sourceSets {