Build: Fix deprecated Gradle configurations usages

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
@@ -19,13 +19,13 @@ dependencies {
embedded(project(":daemon-common-new")) { isTransitive = false }
embedded(projectRuntimeJar(":kotlin-daemon-client"))
testCompile(project(":compiler:cli-common"))
testCompile(project(":daemon-common"))
testCompile(project(":daemon-common-new"))
testCompile(projectRuntimeJar(":kotlin-daemon-client"))
testCompile(commonDep("junit:junit"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(project(":kotlin-test:kotlin-test-junit"))
testApi(project(":compiler:cli-common"))
testApi(project(":daemon-common"))
testApi(project(":daemon-common-new"))
testApi(projectRuntimeJar(":kotlin-daemon-client"))
testApi(commonDep("junit:junit"))
testApi(project(":kotlin-test:kotlin-test-jvm"))
testApi(project(":kotlin-test:kotlin-test-junit"))
testCompilerClasspath(project(":kotlin-compiler"))
testCompilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j"))
testCompilerClasspath(project(":kotlin-scripting-compiler"))
+2 -2
View File
@@ -29,8 +29,8 @@ dependencies {
Platform[203].orHigher {
runtimeOnly(commonDep("net.java.dev.jna", "jna"))
}
testCompile(commonDep("junit:junit"))
testCompile(project(":kotlin-test:kotlin-test-junit"))
testApi(commonDep("junit:junit"))
testApi(project(":kotlin-test:kotlin-test-junit"))
testCompilationClasspath(kotlinStdlib())
}
+7 -7
View File
@@ -8,7 +8,7 @@ description = "Kotlin Compiler"
plugins {
// HACK: java plugin makes idea import dependencies on this project as source (with empty sources however),
// this prevents reindexing of kotlin-compiler.jar after build on every change in compiler modules
java
`java-library`
}
@@ -38,9 +38,9 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
}
}
val compile by configurations // maven plugin writes pom compile scope from compile configuration by default
val api by configurations
val proguardLibraries by configurations.creating {
extendsFrom(compile)
extendsFrom(api)
}
// Libraries to copy to the lib directory
@@ -135,10 +135,10 @@ configurations.all {
}
dependencies {
compile(kotlinStdlib())
compile(project(":kotlin-script-runtime"))
compile(project(":kotlin-reflect"))
compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))
api(kotlinStdlib())
api(project(":kotlin-script-runtime"))
api(project(":kotlin-reflect"))
api(commonDep("org.jetbrains.intellij.deps", "trove4j"))
proguardLibraries(project(":kotlin-annotations-jvm"))