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

[Build] Remove usages of Provider.forUseAtConfigurationTime()

Browse Source 
It's not required anymore and was deprecated since Gradle 7.4
#KTI-1221 In Progress
This commit is contained in:
Alexander.Likhachev
2023-05-17 15:38:24 +02:00
committed by Space Team
parent 58490ea184
commit 407a2d4203
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/build.gradle.kts
+1 -2
View File
@@ -331,8 +331,7 @@ fun Test.setUpBoxTests() {
systemProperty("kotlin.js.test.root.out.dir", "$nodeDir/") systemProperty("kotlin.js.test.root.out.dir", "$nodeDir/")
systemProperty( systemProperty(
"overwrite.output", project.providers.gradleProperty("overwrite.output") "overwrite.output", project.providers.gradleProperty("overwrite.output").orNull ?: "false"
.forUseAtConfigurationTime().orNull ?: "false"
) )
forwardProperties() forwardProperties()
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+3 -3
View File
@@ -105,10 +105,10 @@ dependencies {
} }
// Aapt2 from Android Gradle Plugin 3.2 and below does not handle long paths on Windows. // Aapt2 from Android Gradle Plugin 3.2 and below does not handle long paths on Windows.
val shortenTempRootName = project.providers.systemProperty("os.name").forUseAtConfigurationTime().get().contains("Windows") val shortenTempRootName = project.providers.systemProperty("os.name").get().contains("Windows")
val splitGradleIntegrationTestTasks = val splitGradleIntegrationTestTasks =
project.providers.gradleProperty("gradle.integration.tests.split.tasks").forUseAtConfigurationTime().orNull?.toBoolean() project.providers.gradleProperty("gradle.integration.tests.split.tasks").orNull?.toBoolean()
?: project.kotlinBuildProperties.isTeamcityBuild ?: project.kotlinBuildProperties.isTeamcityBuild
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach { tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
@@ -355,7 +355,7 @@ tasks.withType<Test> {
val jdk11Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_11_0) val jdk11Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_11_0)
val jdk16Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_16_0) val jdk16Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_16_0)
val jdk17Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_17_0) val jdk17Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_17_0)
val mavenLocalRepo = project.providers.systemProperty("maven.repo.local").forUseAtConfigurationTime().orNull val mavenLocalRepo = project.providers.systemProperty("maven.repo.local").orNull
// Query required JDKs paths only on execution phase to avoid triggering auto-download on project configuration phase // Query required JDKs paths only on execution phase to avoid triggering auto-download on project configuration phase
doFirst { doFirst {
wasm/wasm.tests/build.gradle.kts
+2 -2
View File
@@ -31,9 +31,9 @@ val currentOsType = run {
else -> OsName.UNKNOWN else -> OsName.UNKNOWN
} }
val osArch = when (providers.systemProperty("sun.arch.data.model").forUseAtConfigurationTime().get()) { val osArch = when (providers.systemProperty("sun.arch.data.model").get()) {
"32" -> OsArch.X86_32 "32" -> OsArch.X86_32
"64" -> when (providers.systemProperty("os.arch").forUseAtConfigurationTime().get().toLowerCase()) { "64" -> when (providers.systemProperty("os.arch").get().toLowerCase()) {
"aarch64" -> OsArch.ARM64 "aarch64" -> OsArch.ARM64
else -> OsArch.X86_64 else -> OsArch.X86_64
} }