Merge pull request #127 from gradlex-org/bene/build-tweaks

britter · web-flow · commit ff6a9c7b9c77 · 2024-05-21T10:56:05.000+02:00
Build updates
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,13 +8,14 @@ dependencyResolutionManagement {
     repositories.mavenCentral()
 }
 
-gradleEnterprise {
-    val runsOnCI = providers.environmentVariable("CI").getOrElse("false").toBoolean()
-    if (runsOnCI) {
-        buildScan {
-            publishAlways()
-            termsOfServiceUrl = "https://gradle.com/terms-of-service"
-            termsOfServiceAgree = "yes"
+develocity {
+    buildScan {
+        val isCi = providers.environmentVariable("CI").getOrElse("false").toBoolean()
+        if (isCi) {
+            termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
+            termsOfUseAgree = "yes"
+        } else {
+            publishing.onlyIf { false }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,14 @@ dependencyResolutionManagement {`
`8`	`8`	`repositories.mavenCentral()`
`9`	`9`	`}`
`10`	`10`
`11`		`-gradleEnterprise {`
`12`		`- val runsOnCI = providers.environmentVariable("CI").getOrElse("false").toBoolean()`
`13`		`- if (runsOnCI) {`
`14`		`- buildScan {`
`15`		`- publishAlways()`
`16`		`- termsOfServiceUrl = "https://gradle.com/terms-of-service"`
`17`		`- termsOfServiceAgree = "yes"`
	`11`	`+develocity {`
	`12`	`+ buildScan {`
	`13`	`+ val isCi = providers.environmentVariable("CI").getOrElse("false").toBoolean()`
	`14`	`+ if (isCi) {`
	`15`	`+ termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"`
	`16`	`+ termsOfUseAgree = "yes"`
	`17`	`+ } else {`
	`18`	`+ publishing.onlyIf { false }`
`18`	`19`	`}`
`19`	`20`	`}`
`20`	`21`	`}`