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
+2 -2
View File
@@ -26,8 +26,8 @@ sourceSets {
}
dependencies {
testCompile project(":kotlin-test:kotlin-test-common")
testCompile project(":kotlin-test:kotlin-test-annotations-common")
testApi project(":kotlin-test:kotlin-test-common")
testApi project(":kotlin-test:kotlin-test-annotations-common")
}
compileKotlinCommon {
+3 -3
View File
@@ -38,12 +38,12 @@ sourceSets {
}
configurations {
noJdk7TestCompile.extendsFrom(testCompile)
noJdk7TestApi.extendsFrom(testApi)
}
dependencies {
compile project(':kotlin-stdlib')
testCompile project(':kotlin-test:kotlin-test-junit')
api project(':kotlin-stdlib')
testApi project(':kotlin-test:kotlin-test-junit')
}
jar {
+3 -3
View File
@@ -7,9 +7,9 @@ configureSourcesJar()
configureJavadocJar()
dependencies {
compile project(':kotlin-stdlib')
compile project(':kotlin-stdlib-jdk7')
testCompile project(':kotlin-test:kotlin-test-junit')
api project(':kotlin-stdlib')
api project(':kotlin-stdlib-jdk7')
testApi project(':kotlin-test:kotlin-test-junit')
}
sourceSets {
+1 -2
View File
@@ -68,7 +68,7 @@ sourceSets {
dependencies {
expectedBy project(":kotlin-stdlib-common")
commonSources project(path: ":kotlin-stdlib-common", configuration: "sources")
testCompile project(':kotlin-test:kotlin-test-js')
testApi project(':kotlin-test:kotlin-test-js')
}
task prepareComparableSource(type: Copy) {
@@ -322,7 +322,6 @@ task distSourcesJar(type: Jar) {
}
artifacts {
runtime libraryJarWithIr
publishedRuntime libraryJarWithIr
publishedRuntime sourcesJar
sources sourcesJar
@@ -17,11 +17,6 @@ val builtins by configurations.creating {
}
}
val runtime by configurations
val runtimeJar by configurations.creating {
runtime.extendsFrom(this)
}
dependencies {
compileOnly(project(":kotlin-stdlib"))
builtins(project(":core:builtins"))
+3 -2
View File
@@ -50,6 +50,7 @@ configurations {
}
}
compileOnly.extendsFrom(builtins)
testCompileOnly.extendsFrom(builtins)
}
dependencies {
@@ -57,9 +58,9 @@ dependencies {
commonSources project(path: ":kotlin-stdlib-common", configuration: "sources")
compile group: 'org.jetbrains', name: 'annotations', version:'13.0'
api group: 'org.jetbrains', name: 'annotations', version:'13.0'
testCompile project(':kotlin-test:kotlin-test-junit')
testApi project(':kotlin-test:kotlin-test-junit')
builtins project(':core:builtins')
}
+2 -2
View File
@@ -1,8 +1,8 @@
apply plugin: 'kotlin'
dependencies {
compile project(':kotlin-stdlib-jdk8')
testCompile project(':kotlin-test:kotlin-test-junit')
api project(':kotlin-stdlib-jdk8')
testApi project(':kotlin-test:kotlin-test-junit')
}
sourceSets {