[repo] Migrate Groovy build scripts to use 'kotlinStdlib()' directly from buildSrc
This commit is contained in:
committed by
Space Team
parent
3629a9db30
commit
5de2b5aeb4
@@ -86,8 +86,4 @@ allprojects { project ->
|
||||
lambda()
|
||||
}
|
||||
}
|
||||
|
||||
dependencies.ext.kotlinStdlib = { suffix ->
|
||||
DependenciesKt.kotlinStdlib(project, suffix, null)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ dependencies {
|
||||
|
||||
api project(':kotlin-test:kotlin-test-junit')
|
||||
|
||||
compileOnly kotlinStdlib()
|
||||
compileOnly RepoDependencies.kotlinStdlib(project)
|
||||
compileOnly project(':compiler')
|
||||
compileOnly project(':compiler:plugin-api')
|
||||
compileOnly project(':compiler:cli-common')
|
||||
|
||||
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-platform-common'
|
||||
JvmToolchain.updateJvmTarget(project, "1.8")
|
||||
|
||||
dependencies {
|
||||
api kotlinStdlib("common")
|
||||
api RepoDependencies.kotlinStdlib(project, "common")
|
||||
testApi project(":kotlin-test:kotlin-test-common")
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-platform-common'
|
||||
JvmToolchain.updateJvmTarget(project, "1.8")
|
||||
|
||||
dependencies {
|
||||
api kotlinStdlib("common")
|
||||
api RepoDependencies.kotlinStdlib(project, "common")
|
||||
testApi project(":kotlin-test:kotlin-test-annotations-common")
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ configurations {
|
||||
dependencies {
|
||||
expectedBy project(':kotlin-test:kotlin-test-common')
|
||||
expectedBy project(':kotlin-test:kotlin-test-annotations-common')
|
||||
api kotlinStdlib("js")
|
||||
api RepoDependencies.kotlinStdlib(project, "js")
|
||||
}
|
||||
|
||||
compileKotlin2Js {
|
||||
|
||||
@@ -54,7 +54,7 @@ tasks.register("populateNodeModules", Copy) {
|
||||
}
|
||||
|
||||
node {
|
||||
version = DependenciesKt.getNodejsVersion(project)
|
||||
version = RepoDependencies.getNodejsVersion(project)
|
||||
download = true
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ sourceSets {
|
||||
|
||||
dependencies {
|
||||
expectedBy project(':kotlin-test:kotlin-test-common')
|
||||
api(kotlinStdlib())
|
||||
api(RepoDependencies.kotlinStdlib(project))
|
||||
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||
testApi('junit:junit:4.13.2')
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ sourceSets {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api kotlinStdlib()
|
||||
api RepoDependencies.kotlinStdlib(project)
|
||||
compileOnly project(':core:descriptors')
|
||||
compileOnly project(':core:descriptors.jvm')
|
||||
compileOnly project(':core:deserialization')
|
||||
|
||||
@@ -327,7 +327,7 @@ artifacts {
|
||||
|
||||
node {
|
||||
download = true
|
||||
version = DependenciesKt.getNodejsVersion(project)
|
||||
version = RepoDependencies.getNodejsVersion(project)
|
||||
nodeProjectDir = buildDir
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ sourceSets {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly DependenciesKt.kotlinBuiltins(project)
|
||||
compileOnly RepoDependencies.kotlinBuiltins(project)
|
||||
}
|
||||
|
||||
configureSourcesJar()
|
||||
|
||||
@@ -7,7 +7,7 @@ JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
|
||||
configurePublishing(project)
|
||||
|
||||
dependencies {
|
||||
compileOnly kotlinStdlib()
|
||||
compileOnly RepoDependencies.kotlinStdlib(project)
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
Reference in New Issue
Block a user