From 407a2d420311ae932279292d431b1305a4f36130 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Wed, 17 May 2023 15:38:24 +0200 Subject: [PATCH] [Build] Remove usages of Provider.forUseAtConfigurationTime() It's not required anymore and was deprecated since Gradle 7.4 #KTI-1221 In Progress --- js/js.tests/build.gradle.kts | 3 +-- .../kotlin-gradle-plugin-integration-tests/build.gradle.kts | 6 +++--- wasm/wasm.tests/build.gradle.kts | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 47b1ce364b8..d0dc0345134 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -331,8 +331,7 @@ fun Test.setUpBoxTests() { systemProperty("kotlin.js.test.root.out.dir", "$nodeDir/") systemProperty( - "overwrite.output", project.providers.gradleProperty("overwrite.output") - .forUseAtConfigurationTime().orNull ?: "false" + "overwrite.output", project.providers.gradleProperty("overwrite.output").orNull ?: "false" ) forwardProperties() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index 2fc45d4f23b..25a1719e483 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -105,10 +105,10 @@ dependencies { } // 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 = - project.providers.gradleProperty("gradle.integration.tests.split.tasks").forUseAtConfigurationTime().orNull?.toBoolean() + project.providers.gradleProperty("gradle.integration.tests.split.tasks").orNull?.toBoolean() ?: project.kotlinBuildProperties.isTeamcityBuild tasks.withType().configureEach { @@ -355,7 +355,7 @@ tasks.withType { val jdk11Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_11_0) val jdk16Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_16_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 doFirst { diff --git a/wasm/wasm.tests/build.gradle.kts b/wasm/wasm.tests/build.gradle.kts index 4eec0fb2f1e..62718e6c5a0 100644 --- a/wasm/wasm.tests/build.gradle.kts +++ b/wasm/wasm.tests/build.gradle.kts @@ -31,9 +31,9 @@ val currentOsType = run { 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 - "64" -> when (providers.systemProperty("os.arch").forUseAtConfigurationTime().get().toLowerCase()) { + "64" -> when (providers.systemProperty("os.arch").get().toLowerCase()) { "aarch64" -> OsArch.ARM64 else -> OsArch.X86_64 }