azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build] Migrate most of the build logic from Project.buildDir usage

Browse Source 
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:
Alexander.Likhachev
2023-10-11 22:42:51 +02:00
committed by Space Team
parent b784544f8d
commit a19bd2ed2e
69 changed files with 328 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+2 -2
View File
@@ -68,7 +68,7 @@ javadocJar()
testsJar()
val robolectricDependencyDir = "$buildDir/robolectricDependencies"
val robolectricDependencyDir = layout.buildDirectory.dir("robolectricDependencies")
val prepareRobolectricDependencies by tasks.registering(Copy::class) {
from(robolectricDependency)
into(robolectricDependencyDir)
@@ -100,7 +100,7 @@ projectTest {
systemProperty("robolectric.classpath", robolectricClasspathProvider.get())
systemProperty("robolectric.offline", "true")
systemProperty("robolectric.dependency.dir", robolectricDependencyDir)
systemProperty("robolectric.dependency.dir", robolectricDependencyDir.get().asFile)
systemProperty("layoutLib.path", layoutLibConf.singleFile.canonicalPath)
systemProperty("layoutLibApi.path", layoutLibApiConf.singleFile.canonicalPath)
plugins/atomicfu/atomicfu-compiler/build.gradle.kts
+1 -1
View File
@@ -168,7 +168,7 @@ projectTest(jUnitMode = JUnitMode.JUnit5) {
// Exclude all tests with the "atomicfu-native" tag. They should be launched by another test task.
excludeTags("atomicfu-native")
}
useJsIrBoxTests(version = version, buildDir = "$buildDir/")
useJsIrBoxTests(version = version, buildDir = layout.buildDirectory)
workingDir = rootDir
plugins/kotlinx-serialization/build.gradle.kts
+1 -1
View File
@@ -118,7 +118,7 @@ projectTest(parallel = true, jUnitMode = JUnitMode.JUnit5) {
val generateTests by generator("org.jetbrains.kotlinx.serialization.TestGeneratorKt")
fun Test.setUpJsIrBoxTests() {
useJsIrBoxTests(version = version, buildDir = "$buildDir/")
useJsIrBoxTests(version = version, buildDir = layout.buildDirectory)
val localJsCoreRuntimeForTests: FileCollection = coreJsIrRuntimeForTests
val localJsJsonRuntimeForTests: FileCollection = jsonJsIrRuntimeForTests
plugins/parcelize/parcelize-compiler/build.gradle.kts
+2 -2
View File
@@ -87,7 +87,7 @@ sourcesJar()
javadocJar()
testsJar()
val robolectricDependencyDir = "$buildDir/robolectricDependencies"
val robolectricDependencyDir = layout.buildDirectory.dir("robolectricDependencies")
val prepareRobolectricDependencies by tasks.registering(Copy::class) {
from(robolectricDependency)
into(robolectricDependencyDir)
@@ -113,7 +113,7 @@ projectTest(jUnitMode = JUnitMode.JUnit5) {
systemProperty("robolectric.classpath", robolectricClasspathConf.asPath)
systemProperty("robolectric.offline", "true")
systemProperty("robolectric.dependency.dir", robolectricDependencyDir)
systemProperty("robolectric.dependency.dir", robolectricDependencyDir.get().asFile)
systemProperty("layoutLib.path", layoutLibConf.singleFile.canonicalPath)
systemProperty("layoutLibApi.path", layoutLibApiConf.singleFile.canonicalPath)