diff options
| author | bingran <bingran@google.com> | 2022-02-23 16:30:42 -0800 |
|---|---|---|
| committer | Bingran Li <bingran@google.com> | 2022-03-03 18:24:25 +0000 |
| commit | 6fef26bec95c963b65b6b345e8b2fd7b45a1b6e7 (patch) | |
| tree | b5f53c2df98116ce7bdcfeebb2afee62680e5452 | |
| parent | 2bca9d12f0658baca8e60c8e0787e450d0d547fe (diff) | |
| download | data-binding-6fef26bec95c963b65b6b345e8b2fd7b45a1b6e7.tar.gz | |
Move away from using forUseAtConfigurationTime
Bug: 215280007
Test: existing
Change-Id: I20e1cb27453ae3cd5a384af8eee71bfc0c7820b9
| -rw-r--r-- | extensions-support/build.gradle | 15 | ||||
| -rw-r--r-- | extensions/build.gradle | 21 | ||||
| -rw-r--r-- | propLoader.gradle | 1 |
3 files changed, 15 insertions, 22 deletions
diff --git a/extensions-support/build.gradle b/extensions-support/build.gradle index 070fc513..98da568a 100644 --- a/extensions-support/build.gradle +++ b/extensions-support/build.gradle @@ -56,13 +56,12 @@ buildscript { ext.autoConfigured = autoConfigured - def TOOLS_VERSION = project.providers.environmentVariable("VERSION").forUseAtConfigurationTime().orElse(buildToolsProperties.get("buildVersion").toString()).get() + def TOOLS_VERSION = project.providers.environmentVariable("VERSION").orElse(buildToolsProperties.get("buildVersion").toString()).get() def OUT_REPO = project.providers.environmentVariable("OUT_REPO") - .forUseAtConfigurationTime() - .orElse(project.providers.environmentVariable("BUILD_DIR").forUseAtConfigurationTime()) + .orElse(project.providers.environmentVariable("BUILD_DIR")) .orNull - def MAVEN_REPO = project.providers.environmentVariable("MAVEN_REPO").forUseAtConfigurationTime().orNull - def PREBUILTS_REPO = project.providers.environmentVariable("PREBUILTS_REPO").forUseAtConfigurationTime().orNull + def MAVEN_REPO = project.providers.environmentVariable("MAVEN_REPO").orNull + def PREBUILTS_REPO = project.providers.environmentVariable("PREBUILTS_REPO").orNull if (runningInIde) { Properties devVersions = new Properties() devVersions.load(new FileInputStream("$projectDir/../../buildSrc/base/version.properties")) @@ -145,9 +144,9 @@ task createArchive(type: Zip) { } subprojects { - def BUILD_DIR = project.providers.environmentVariable("BUILD_DIR").forUseAtConfigurationTime() - if (BUILD_DIR.isPresent()) { - buildDir = new File(BUILD_DIR.get(), "$name-build") + def BUILD_DIR = System.getenv("BUILD_DIR") + if (BUILD_DIR != null) { + buildDir = new File(BUILD_DIR, "$name-build") } if (project.path == ":doclava") { return diff --git a/extensions/build.gradle b/extensions/build.gradle index b8316232..4d22ab13 100644 --- a/extensions/build.gradle +++ b/extensions/build.gradle @@ -59,16 +59,11 @@ buildscript { def autoConfigured = !gradle.startParameter.getInitScripts().isEmpty() && !runningInIde ext.autoConfigured = autoConfigured - def TOOLS_VERSION = project.providers.environmentVariable("VERSION") - .forUseAtConfigurationTime() - .orElse(buildToolsProperties.get("buildVersion").toString()) - .get() - def OUT_REPO = project.providers.environmentVariable("OUT_REPO") - .forUseAtConfigurationTime() - .orElse(project.providers.environmentVariable("BUILD_DIR").forUseAtConfigurationTime()) - .orNull - def MAVEN_REPO = project.providers.environmentVariable("MAVEN_REPO").forUseAtConfigurationTime().orNull - def PREBUILTS_REPO = project.providers.environmentVariable("PREBUILTS_REPO").forUseAtConfigurationTime().orNull + def TOOLS_VERSION = + System.getenv("VERSION") ?: buildToolsProperties.get("buildVersion").toString() + def OUT_REPO = System.getenv("OUT_REPO") ?: System.getenv("BUILD_DIR") + def MAVEN_REPO = System.getenv("MAVEN_REPO") + def PREBUILTS_REPO = System.getenv("PREBUILTS_REPO") if (runningInIde) { Properties devVersions = new Properties() devVersions.load(new FileInputStream("$projectDir/../../buildSrc/base/version.properties")) @@ -161,9 +156,9 @@ task createArchive(type: Zip) { } subprojects { - def BUILD_DIR = project.providers.environmentVariable("BUILD_DIR").forUseAtConfigurationTime() - if (BUILD_DIR.isPresent()) { - buildDir = new File(BUILD_DIR.get(), "$name-build") + def BUILD_DIR = System.getenv("BUILD_DIR") + if (BUILD_DIR != null) { + buildDir = new File(BUILD_DIR, "$name-build") } if (project.path == ":doclava") { return diff --git a/propLoader.gradle b/propLoader.gradle index 4088cc0c..56f9d663 100644 --- a/propLoader.gradle +++ b/propLoader.gradle @@ -1,6 +1,5 @@ boolean getBooleanValue(Project proj, String propertyName, boolean defaultValue) { return proj.providers.gradleProperty(propertyName) - .forUseAtConfigurationTime() .map { Boolean.valueOf(it) } .orElse(defaultValue) .get() |