Build: Fix deprecated Gradle configurations usages
for migration to Gradle 7+ #KTI-559
This commit is contained in:
@@ -22,7 +22,7 @@ sourceSets {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile kotlinStdlib()
|
||||
api kotlinStdlib()
|
||||
compileOnly project(':core:descriptors')
|
||||
compileOnly project(':core:descriptors.jvm')
|
||||
compileOnly project(':core:deserialization')
|
||||
@@ -69,5 +69,4 @@ task java9Jar(type: Jar) {
|
||||
|
||||
artifacts {
|
||||
archives java9Jar
|
||||
runtime java9Jar
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ buildscript {
|
||||
}
|
||||
|
||||
plugins {
|
||||
java
|
||||
`java-library`
|
||||
}
|
||||
|
||||
configureJavaOnlyToolchain(JdkMajorVersion.JDK_1_6)
|
||||
@@ -35,10 +35,9 @@ val embedded by configurations
|
||||
embedded.isTransitive = false
|
||||
|
||||
configurations.getByName("compileOnly").extendsFrom(embedded)
|
||||
val mainJar by configurations.creating
|
||||
|
||||
dependencies {
|
||||
compile(kotlinStdlib())
|
||||
api(kotlinStdlib())
|
||||
|
||||
proguardDeps(kotlinStdlib())
|
||||
proguardAdditionalInJars(project(":kotlin-annotations-jvm"))
|
||||
@@ -256,8 +255,8 @@ dexMethodCount {
|
||||
}
|
||||
|
||||
artifacts {
|
||||
listOf(mainJar.name, "runtime", "archives", "runtimeElements").forEach { configurationName ->
|
||||
add(configurationName, result.get().outputs.files.singleFile) {
|
||||
listOf("archives", "runtimeElements").forEach { configurationName ->
|
||||
add(configurationName, provider { result.get().outputs.files.singleFile }) {
|
||||
builtBy(result)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user