Build: Fix deprecated Gradle configurations usages
for migration to Gradle 7+ #KTI-559
This commit is contained in:
@@ -5,8 +5,8 @@ apply plugin: 'kotlin-platform-common'
|
||||
JvmToolchain.updateJvmTarget(project, "1.6")
|
||||
|
||||
dependencies {
|
||||
compile kotlinStdlib("common")
|
||||
testCompile project(":kotlin-test:kotlin-test-common")
|
||||
api kotlinStdlib("common")
|
||||
testApi project(":kotlin-test:kotlin-test-common")
|
||||
}
|
||||
|
||||
tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {
|
||||
|
||||
@@ -5,8 +5,8 @@ apply plugin: 'kotlin-platform-common'
|
||||
JvmToolchain.updateJvmTarget(project, "1.6")
|
||||
|
||||
dependencies {
|
||||
compile kotlinStdlib("common")
|
||||
testCompile project(":kotlin-test:kotlin-test-annotations-common")
|
||||
api kotlinStdlib("common")
|
||||
testApi project(":kotlin-test:kotlin-test-annotations-common")
|
||||
}
|
||||
|
||||
jar {
|
||||
|
||||
@@ -10,7 +10,7 @@ configurations {
|
||||
dependencies {
|
||||
expectedBy project(':kotlin-test:kotlin-test-common')
|
||||
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
||||
compile kotlinStdlib("js")
|
||||
api kotlinStdlib("js")
|
||||
}
|
||||
|
||||
compileKotlin2Js {
|
||||
@@ -73,7 +73,6 @@ task sourcesJar(type: Jar, dependsOn: classes) {
|
||||
}
|
||||
|
||||
artifacts {
|
||||
runtime libraryJarWithIr
|
||||
archives libraryJarWithIr
|
||||
distLibrary libraryJarWithIr
|
||||
archives sourcesJar
|
||||
|
||||
@@ -12,7 +12,7 @@ apply plugin: 'kotlin-platform-js'
|
||||
|
||||
configurations {
|
||||
nodeModules {
|
||||
extendsFrom compile
|
||||
extendsFrom api
|
||||
attributes {
|
||||
attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, KotlinUsages.KOTLIN_RUNTIME))
|
||||
attribute(KotlinPlatformType.attribute, KotlinPlatformType.js)
|
||||
@@ -21,7 +21,7 @@ configurations {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':kotlin-test:kotlin-test-js')
|
||||
api project(':kotlin-test:kotlin-test-js')
|
||||
}
|
||||
|
||||
// package.json contains direct links to the builddir
|
||||
|
||||
@@ -14,8 +14,8 @@ sourceSets {
|
||||
|
||||
dependencies {
|
||||
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
||||
compile project(':kotlin-test:kotlin-test-jvm')
|
||||
compile('junit:junit:4.12')
|
||||
api project(':kotlin-test:kotlin-test-jvm')
|
||||
api('junit:junit:4.12')
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -14,10 +14,10 @@ project.ext["jpsLibraryPath"] = rootProject.distLibDir
|
||||
|
||||
dependencies {
|
||||
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
||||
compile project(':kotlin-test:kotlin-test-jvm')
|
||||
api project(':kotlin-test:kotlin-test-jvm')
|
||||
|
||||
compile("org.junit.jupiter:junit-jupiter-api:5.0.0")
|
||||
testRuntime("org.junit.jupiter:junit-jupiter-engine:5.2.0")
|
||||
api("org.junit.jupiter:junit-jupiter-api:5.0.0")
|
||||
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.2.0")
|
||||
}
|
||||
|
||||
jar {
|
||||
|
||||
@@ -16,9 +16,9 @@ sourceSets {
|
||||
|
||||
dependencies {
|
||||
expectedBy project(':kotlin-test:kotlin-test-common')
|
||||
compile kotlinStdlib()
|
||||
testCompile project(":kotlin-test:kotlin-test-junit")
|
||||
testCompile('junit:junit:4.12')
|
||||
api(kotlinStdlib())
|
||||
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||
testApi('junit:junit:4.12')
|
||||
}
|
||||
|
||||
jar {
|
||||
|
||||
@@ -15,8 +15,8 @@ sourceSets {
|
||||
|
||||
dependencies {
|
||||
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
||||
compile project(':kotlin-test:kotlin-test-jvm')
|
||||
compile('org.testng:testng:6.13.1')
|
||||
api project(':kotlin-test:kotlin-test-jvm')
|
||||
api('org.testng:testng:6.13.1')
|
||||
if (includeJava9) {
|
||||
java9CompileOnly('org.testng:testng:7.0.0')
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user