[Build] Migrate most of the build logic from Project.buildDir usage
It's going to be deprecated in Gradle 8.3 There's currently no way to pass a `org.gradle.api.provider.Provider` to the JavaExec.systemProperty or Test.systemProperty. There's a workaround using `org.gradle.process.CommandLineArgumentProvider`, but I intentionally don't rework these calls as Gradle is going to allow passing providers to configure system properties: https://github.com/gradle/gradle/issues/12247#issuecomment-1568427242 ^KTI-1473 In Progress
This commit is contained in:
committed by
Space Team
parent
b784544f8d
commit
a19bd2ed2e
@@ -46,10 +46,10 @@ dependencies {
|
||||
}
|
||||
|
||||
val builtinsDir = "${rootDir}/core/builtins"
|
||||
val builtinsSrcDir = "${buildDir}/src/builtin-sources"
|
||||
val builtinsSrcDir = "${layout.buildDirectory.get().asFile}/src/builtin-sources"
|
||||
|
||||
val jsDir = "${projectDir}/js"
|
||||
val jsBuiltinsSrcDir = "${buildDir}/src/js-builtin-sources"
|
||||
val jsBuiltinsSrcDir = "${layout.buildDirectory.get().asFile}/src/js-builtin-sources"
|
||||
|
||||
val commonOptIns = listOf(
|
||||
"kotlin.ExperimentalMultiplatform",
|
||||
@@ -473,7 +473,7 @@ kotlin {
|
||||
}
|
||||
}
|
||||
|
||||
into("$buildDir/src/wasm-builtin-sources")
|
||||
into(layout.buildDirectory.dir("src/wasm-builtin-sources"))
|
||||
}
|
||||
|
||||
}
|
||||
@@ -527,7 +527,7 @@ kotlin {
|
||||
val prepareKotlinTestCommonNativeSources by tasks.registering(Sync::class) {
|
||||
from("../kotlin.test/common/src/main/kotlin")
|
||||
from("../kotlin.test/annotations-common/src/main/kotlin")
|
||||
into("$buildDir/src/native-kotlin-test-common-sources")
|
||||
into(layout.buildDirectory.dir("src/native-kotlin-test-common-sources"))
|
||||
}
|
||||
|
||||
kotlin {
|
||||
@@ -642,13 +642,13 @@ tasks {
|
||||
from(jsJar)
|
||||
rename { _ -> "full-runtime.klib" }
|
||||
// some tests expect stdlib-js klib in this location
|
||||
into(rootProject.buildDir.resolve("js-ir-runtime"))
|
||||
into(rootProject.layout.buildDirectory.dir("js-ir-runtime"))
|
||||
}
|
||||
|
||||
val jsRearrangedSourcesJar by registering(Jar::class) {
|
||||
archiveClassifier.set("js-sources")
|
||||
archiveVersion.set("")
|
||||
destinationDirectory.set(file("$buildDir/lib"))
|
||||
destinationDirectory.set(layout.buildDirectory.dir("lib"))
|
||||
|
||||
includeEmptyDirs = false
|
||||
duplicatesStrategy = DuplicatesStrategy.FAIL
|
||||
|
||||
@@ -25,7 +25,7 @@ val commonMainFullSources by task<Sync> {
|
||||
}
|
||||
}
|
||||
|
||||
into("$buildDir/commonMainFullSources")
|
||||
into(layout.buildDirectory.dir("commonMainFullSources"))
|
||||
}
|
||||
|
||||
val commonMainSources by task<Sync> {
|
||||
@@ -72,7 +72,7 @@ val commonMainSources by task<Sync> {
|
||||
commonMainFullSources.get().outputs.files.singleFile
|
||||
}
|
||||
|
||||
into("$buildDir/commonMainSources")
|
||||
into(layout.buildDirectory.dir("commonMainSources"))
|
||||
}
|
||||
|
||||
val commonMainCollectionSources by task<Sync> {
|
||||
@@ -82,7 +82,7 @@ val commonMainCollectionSources by task<Sync> {
|
||||
commonMainFullSources.get().outputs.files.singleFile
|
||||
}
|
||||
|
||||
into("$buildDir/commonMainCollectionSources")
|
||||
into(layout.buildDirectory.dir("commonMainCollectionSources"))
|
||||
}
|
||||
|
||||
val jsMainSources by task<Sync> {
|
||||
@@ -131,7 +131,7 @@ val jsMainSources by task<Sync> {
|
||||
into("builtins")
|
||||
}
|
||||
|
||||
into("$buildDir/jsMainSources")
|
||||
into(layout.buildDirectory.dir("jsMainSources"))
|
||||
}
|
||||
|
||||
kotlin {
|
||||
|
||||
@@ -25,7 +25,7 @@ dependencies {
|
||||
sourceSets {
|
||||
"main" {
|
||||
java.apply {
|
||||
srcDir(File(buildDir, "src"))
|
||||
srcDir(layout.buildDirectory.dir("src"))
|
||||
}
|
||||
}
|
||||
"test" {}
|
||||
@@ -50,7 +50,7 @@ val copySources by task<Sync> {
|
||||
"kotlin/enums/EnumEntries.kt",
|
||||
"kotlin/collections/AbstractList.kt",
|
||||
"kotlin/io/Serializable.kt")
|
||||
into(File(buildDir, "src"))
|
||||
into(layout.buildDirectory.dir("src"))
|
||||
}
|
||||
|
||||
|
||||
@@ -91,6 +91,6 @@ publishing {
|
||||
}
|
||||
|
||||
repositories {
|
||||
maven("${rootProject.buildDir}/internal/repo")
|
||||
maven(rootProject.layout.buildDirectory.dir("internal/repo"))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user