Skip to content

Commit b6fe7df

Browse files
authored
Replace usages of System.getProperty with gradle.startParameter.systemPropertiesArgs in initialization scripts (#361)
1 parent c7e8a25 commit b6fe7df

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

components/scripts/gradle/gradle-init-scripts/configure-gradle-enterprise.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ initscript {
1212

1313
def getInputParam = { String name ->
1414
def envVarName = name.toUpperCase().replace('.', '_').replace('-', '_')
15-
return System.getProperty(name) ?: System.getenv(envVarName)
15+
return gradle.startParameter.systemPropertiesArgs[name] ?: System.getenv(envVarName)
1616
}
1717

1818
def pluginRepositoryUrl = getInputParam('com.gradle.enterprise.build-validation.gradle.plugin-repository.url')
@@ -61,7 +61,7 @@ if (!isTopLevelBuild) {
6161

6262
def getInputParam = { String name ->
6363
def envVarName = name.toUpperCase().replace('.', '_').replace('-', '_')
64-
return System.getProperty(name) ?: System.getenv(envVarName)
64+
return gradle.startParameter.systemPropertiesArgs[name] ?: System.getenv(envVarName)
6565
}
6666

6767
def geUrl = getInputParam('com.gradle.enterprise.build-validation.gradle-enterprise.url')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if (!isTopLevelBuild) {
55

66
def getInputParam = { String name ->
77
def envVarName = name.toUpperCase().replace('.', '_').replace('-', '_')
8-
return System.getProperty(name) ?: System.getenv(envVarName)
8+
return gradle.startParameter.systemPropertiesArgs[name] ?: System.getenv(envVarName)
99
}
1010

1111
def expDir = getInputParam('com.gradle.enterprise.build-validation.expDir')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if (!isTopLevelBuild) {
55

66
def getInputParam = { String name ->
77
def envVarName = name.toUpperCase().replace('.', '_').replace('-', '_')
8-
return System.getProperty(name) ?: System.getenv(envVarName)
8+
return gradle.startParameter.systemPropertiesArgs[name] ?: System.getenv(envVarName)
99
}
1010

1111
def remoteBuildCacheUrl = getInputParam('com.gradle.enterprise.build-validation.remoteBuildCacheUrl')

0 commit comments

Comments
 (0)