From 9be06da045dc16c43e1dc9f982ac70468998f514 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Tue, 16 Feb 2021 22:10:33 +0300 Subject: [PATCH] [Build] Make Gradle IT buildscript property reads via Gradle providers Relates to #KT-44611 --- .../build.gradle.kts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 9560456ae31..9a5b43cee9b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -50,11 +50,12 @@ dependencies { } // Aapt2 from Android Gradle Plugin 3.2 and below does not handle long paths on Windows. -val shortenTempRootName = System.getProperty("os.name")!!.contains("Windows") +val shortenTempRootName = project.providers.systemProperty("os.name").forUseAtConfigurationTime().get().contains("Windows") val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild || try { - project.properties["gradle.integration.tests.split.tasks"]?.toString()?.toBoolean() ?: false + project.providers.gradleProperty("gradle.integration.tests.split.tasks").forUseAtConfigurationTime().orNull + ?.toBoolean() ?: false } catch (_: Exception) { false } fun Test.includeMppAndAndroid(include: Boolean) { @@ -154,7 +155,8 @@ tasks.withType { } tasks.withType { - onlyIf { !project.hasProperty("noTest") } + val noTestProperty = project.providers.gradleProperty("noTest") + onlyIf { !noTestProperty.isPresent } dependsOn(":kotlin-gradle-plugin:validatePlugins") dependsOnKotlinGradlePluginInstall() @@ -167,7 +169,7 @@ tasks.withType { systemProperty("jdk10Home", rootProject.extra["JDK_10"] as String) systemProperty("jdk11Home", rootProject.extra["JDK_11"] as String) - val mavenLocalRepo = System.getProperty("maven.repo.local") + val mavenLocalRepo = project.providers.systemProperty("maven.repo.local").forUseAtConfigurationTime().orNull if (mavenLocalRepo != null) { systemProperty("maven.repo.local", mavenLocalRepo) }