comparison 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
comparison
equal deleted inserted replaced
291:7dc9624e59f7 292:2307b12a55e6
11 } 11 }
12 12
13 // buildScan { termsOfServiceUrl = 'https://gradle.com/terms-of-service'; termsOfServiceAgree = 'yes' } 13 // buildScan { termsOfServiceUrl = 'https://gradle.com/terms-of-service'; termsOfServiceAgree = 'yes' }
14 14
15 final GradleVersion gradleCurrent = GradleVersion.current() 15 final GradleVersion gradleCurrent = GradleVersion.current()
16 final GradleVersion gradleV70 = GradleVersion.version('7.0') 16 final GradleVersion gradleV70 = GradleVersion.version('7.2')
17 17
18 if (gradleCurrent < gradleV70) { 18 if (gradleCurrent < gradleV70) {
19 throw new RuntimeException("this init script requires Gradle version 7.0 or higher") 19 throw new RuntimeException("This init script requires Gradle version 7.2 or higher (bugs in earlier version of Gradle 7.0 and 7.1)")
20 } 20 }
21 21
22 gradle.ext.ssdtDevelkitLocation = gradle.ext.has('ssdtDevelkitLocation') ? gradle.ssdtDevelkitLocation : 'http://hg.ssdt-ohio.org/browse/public/develkit' 22 gradle.ext.ssdtDevelkitLocation = gradle.ext.has('ssdtDevelkitLocation') ? gradle.ssdtDevelkitLocation : 'http://hg.ssdt-ohio.org/browse/public/develkit'
23 23
24 ant.property(file: System.getProperty('user.home') + "/.ssdt/private.properties") 24 ant.property(file: System.getProperty('user.home') + "/.ssdt/private.properties")
139 if (gradle.bambooBuild) { 139 if (gradle.bambooBuild) {
140 140
141 file('build-number.txt').text = "build.number=${gradle.branch.buildNumber ?: -1 }\n" 141 file('build-number.txt').text = "build.number=${gradle.branch.buildNumber ?: -1 }\n"
142 gradle.ext.ssdtGradlekitLocation = gradle.ext.has('ssdtGradlekitLocation') ? gradle.ssdtGradlekitLocation : 'http://hg.ssdt-ohio.org/ssdt/gradlekit/raw-file/tip' 142 gradle.ext.ssdtGradlekitLocation = gradle.ext.has('ssdtGradlekitLocation') ? gradle.ssdtGradlekitLocation : 'http://hg.ssdt-ohio.org/ssdt/gradlekit/raw-file/tip'
143 logger.info "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)" 143 logger.info "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)"
144 apply from: resources.text.fromInsecureUri("${gradle.ssdtGradlekitLocation}/artifactory40.gradle") 144 apply from: resources.text.fromInsecureUri("${gradle.ssdtGradlekitLocation}/artifactory70.gradle")
145 } 145 }
146 146
147 if (!rootProject.hasProperty('disableMetrics')) { 147 if (!rootProject.hasProperty('disableMetrics')) {
148 apply from: resources.text.fromInsecureUri("${gradle.ssdtDevelkitLocation}/metrics50.gradle") 148 apply from: resources.text.fromInsecureUri("${gradle.ssdtDevelkitLocation}/metrics70.gradle")
149 } 149 }
150 150
151 rootProject.afterEvaluate { r -> 151 rootProject.afterEvaluate { r ->
152 if (gradle.bambooBuild && r.hasProperty('requireJavaVersion')) { 152 if (gradle.bambooBuild && r.hasProperty('requireJavaVersion')) {
153 gradle.runtimeInfo.requireJava( r.getProperty('requireJavaVersion') ) 153 gradle.runtimeInfo.requireJava( r.getProperty('requireJavaVersion') )