diff init70.gradle @ 292:2307b12a55e6

merge
author Marc Davis <marc.davis@mcoecn.org>
date Mon, 22 Aug 2022 14:34:04 -0400
parents 36b6c48ee6c7
children ca537e63716d
line wrap: on
line diff
--- a/init70.gradle	Mon Aug 22 14:32:18 2022 -0400
+++ b/init70.gradle	Mon Aug 22 14:34:04 2022 -0400
@@ -13,10 +13,10 @@
 // buildScan { termsOfServiceUrl = 'https://gradle.com/terms-of-service'; termsOfServiceAgree = 'yes' }
 
 final GradleVersion gradleCurrent = GradleVersion.current()
-final GradleVersion gradleV70 = GradleVersion.version('7.0')
+final GradleVersion gradleV70 = GradleVersion.version('7.2')
 
 if (gradleCurrent < gradleV70) {
-    throw new RuntimeException("this init script requires Gradle version 7.0 or higher")
+    throw new RuntimeException("This init script requires Gradle version 7.2 or higher (bugs in earlier version of Gradle 7.0 and 7.1)")
 }
 
 gradle.ext.ssdtDevelkitLocation = gradle.ext.has('ssdtDevelkitLocation') ? gradle.ssdtDevelkitLocation : 'http://hg.ssdt-ohio.org/browse/public/develkit'
@@ -141,11 +141,11 @@
     file('build-number.txt').text = "build.number=${gradle.branch.buildNumber ?: -1 }\n"
     gradle.ext.ssdtGradlekitLocation = gradle.ext.has('ssdtGradlekitLocation') ? gradle.ssdtGradlekitLocation : 'http://hg.ssdt-ohio.org/ssdt/gradlekit/raw-file/tip'
     logger.info "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)"
-    apply from: resources.text.fromInsecureUri("${gradle.ssdtGradlekitLocation}/artifactory40.gradle")
+    apply from: resources.text.fromInsecureUri("${gradle.ssdtGradlekitLocation}/artifactory70.gradle")
 }
 
 if (!rootProject.hasProperty('disableMetrics')) {
-    apply from: resources.text.fromInsecureUri("${gradle.ssdtDevelkitLocation}/metrics50.gradle")
+    apply from: resources.text.fromInsecureUri("${gradle.ssdtDevelkitLocation}/metrics70.gradle")
 }
 
 rootProject.afterEvaluate { r ->