Create isScanDump variable

erichaagdev · erichaagdev · commit bff65a81307f · 2022-12-29T11:42:19.000-06:00
diff --git a/components/scripts/gradle/gradle-init-scripts/configure-gradle-enterprise.gradle b/components/scripts/gradle/gradle-init-scripts/configure-gradle-enterprise.gradle
@@ -50,6 +50,7 @@ if (!isTopLevelBuild) {
 }
 
 def enableGradleEnterprise = Boolean.getBoolean("com.gradle.enterprise.build_validation.enableGradleEnterprise")
+def isScanDump = System.properties.containsKey("scan.dump")
 
 clearWarnings()
 
@@ -109,7 +110,7 @@ if (GradleVersion.current() < GradleVersion.version('6.0')) {
         }
     }
 
-    if (!System.properties.containsKey("scan.dump")) {
+    if (!isScanDump) {
         projectsEvaluated { gradle ->
             configureGradleEnterprise(gradle.rootProject.extensions["gradleEnterprise"])
         }
@@ -136,7 +137,7 @@ if (GradleVersion.current() < GradleVersion.version('6.0')) {
         }
 
         extensionsWithPublicType(settings, GRADLE_ENTERPRISE_EXTENSION_CLASS).collect { settings[it.name] }.each { ext ->
-            if (!System.properties.containsKey("scan.dump")) {
+            if (!isScanDump) {
                 configureGradleEnterprise(ext)
             }
             buildScanPublishedAction(ext.buildScan)

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ if (!isTopLevelBuild) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`def enableGradleEnterprise = Boolean.getBoolean("com.gradle.enterprise.build_validation.enableGradleEnterprise")`
	`53`	`+def isScanDump = System.properties.containsKey("scan.dump")`
`53`	`54`
`54`	`55`	`clearWarnings()`
`55`	`56`
`@@ -109,7 +110,7 @@ if (GradleVersion.current() < GradleVersion.version('6.0')) {`
`109`	`110`	`}`
`110`	`111`	`}`
`111`	`112`
`112`		`- if (!System.properties.containsKey("scan.dump")) {`
	`113`	`+ if (!isScanDump) {`
`113`	`114`	`projectsEvaluated { gradle ->`
`114`	`115`	`configureGradleEnterprise(gradle.rootProject.extensions["gradleEnterprise"])`
`115`	`116`	`}`
`@@ -136,7 +137,7 @@ if (GradleVersion.current() < GradleVersion.version('6.0')) {`
`136`	`137`	`}`
`137`	`138`
`138`	`139`	`extensionsWithPublicType(settings, GRADLE_ENTERPRISE_EXTENSION_CLASS).collect { settings[it.name] }.each { ext ->`
`139`		`- if (!System.properties.containsKey("scan.dump")) {`
	`140`	`+ if (!isScanDump) {`
`140`	`141`	`configureGradleEnterprise(ext)`
`141`	`142`	`}`
`142`	`143`	`buildScanPublishedAction(ext.buildScan)`