Merge pull request #769 from gradle/erichaagdev/injection-script-sys-prop

Custom logic to transform common Develocity injection script is reverted

Author: erichaagdev

build.gradle.kts

@@ -170,7 +170,6 @@ val copyGradleScripts by tasks.registering(Sync::class) {
     from(develocityInjectionResolvable) {
         rename { "develocity-injection.gradle" }
         into("lib/scripts/gradle-init-scripts")
-        filter(TransformDevelocityInjectionScript())
     }
     from(layout.projectDirectory.dir("components/scripts")) {
         include("README.md")

buildSrc/src/main/kotlin/TransformDevelocityInjectionScript.kt

@@ -1,10 +1,10 @@
 import org.gradle.util.GradleVersion
 import java.nio.charset.StandardCharsets
 
-def getInputParam = { String name ->
+static getInputParam(Gradle gradle, String name) {
     def ENV_VAR_PREFIX = ''
     def envVarName = ENV_VAR_PREFIX + name.toUpperCase().replace('.', '_').replace('-', '_')
-    return gradle.startParameter.systemPropertiesArgs[name] ?: System.getenv(envVarName)
+    return gradle.startParameter.systemPropertiesArgs[name] ?: System.getProperty(name) ?: System.getenv(envVarName)
 }
 
 def isTopLevelBuild = !gradle.parent
@@ -17,10 +17,10 @@ def GRADLE_ENTERPRISE_PLUGIN_ID = 'com.gradle.enterprise'
 def DEVELOCITY_PLUGIN_ID = 'com.gradle.develocity'
 def CCUD_PLUGIN_ID = 'com.gradle.common-custom-user-data-gradle-plugin'
 
-def expDir = getInputParam('develocity.build-validation.expDir')
-def expId = getInputParam('develocity.build-validation.expId')
-def runId = getInputParam('develocity.build-validation.runId')
-def scriptsVersion = getInputParam('develocity.build-validation.scriptsVersion')
+def expDir = getInputParam(gradle, 'develocity.build-validation.expDir')
+def expId = getInputParam(gradle, 'develocity.build-validation.expId')
+def runId = getInputParam(gradle, 'develocity.build-validation.runId')
+def scriptsVersion = getInputParam(gradle, 'develocity.build-validation.scriptsVersion')
 
 def atLeastGradle5 = GradleVersion.current() >= GradleVersion.version('5.0')
 
@@ -36,11 +36,12 @@ def registerBuildScanActions = { def buildScan, def rootProjectName ->
         // safely for Gradle 7.0.2 and earlier, and we must do so anyway because referencing a Gradle
         // script object, e.g., 'gradle.startParameter', from a Groovy closure is not compatible with
         // configuration cache
-        def getRunNumInputParam = { String name ->
-            def envVarName = name.toUpperCase().replace('.', '_').replace('-', '_')
+        def getInputParam = { String name ->
+            def ENV_VAR_PREFIX = ''
+            def envVarName = ENV_VAR_PREFIX + name.toUpperCase().replace('.', '_').replace('-', '_')
             return System.getProperty(name) ?: System.getenv(envVarName)
         }
-        def runNum = getRunNumInputParam('develocity.build-validation.runNum')
+        def runNum = getInputParam('develocity.build-validation.runNum')
         def buildScanUri = publishedBuildScan.buildScanUri
         def buildScanId = publishedBuildScan.buildScanId
         def port = (buildScanUri.port != -1) ? ':' + buildScanUri.port : ''

components/scripts/gradle/gradle-init-scripts/configure-build-validation.gradle

@@ -1,10 +1,10 @@
-def getInputParam = { String name ->
+static getInputParam(Gradle gradle, String name) {
     def ENV_VAR_PREFIX = ''
     def envVarName = ENV_VAR_PREFIX + name.toUpperCase().replace('.', '_').replace('-', '_')
-    return gradle.startParameter.systemPropertiesArgs[name] ?: System.getenv(envVarName)
+    return gradle.startParameter.systemPropertiesArgs[name] ?: System.getProperty(name) ?: System.getenv(envVarName)
 }
 
-def expDir = getInputParam('develocity.build-validation.expDir')
+def expDir = getInputParam(gradle, 'develocity.build-validation.expDir')
 
 settingsEvaluated { settings ->
     settings.buildCache {

components/scripts/gradle/gradle-init-scripts/configure-local-build-caching.gradle

@@ -1,10 +1,10 @@
-def getInputParam = { String name ->
+static getInputParam(Gradle gradle, String name) {
     def ENV_VAR_PREFIX = ''
     def envVarName = ENV_VAR_PREFIX + name.toUpperCase().replace('.', '_').replace('-', '_')
-    return gradle.startParameter.systemPropertiesArgs[name] ?: System.getenv(envVarName)
+    return gradle.startParameter.systemPropertiesArgs[name] ?: System.getProperty(name) ?: System.getenv(envVarName)
 }
 
-def remoteBuildCacheUrl = getInputParam('develocity.build-validation.remoteBuildCacheUrl')
+def remoteBuildCacheUrl = getInputParam(gradle, 'develocity.build-validation.remoteBuildCacheUrl')
 
 settingsEvaluated { settings ->
     settings.buildCache {