Mercurial > public > develkit
changeset 292:2307b12a55e6
merge
| author | Marc Davis <marc.davis@mcoecn.org> |
|---|---|
| date | Mon, 22 Aug 2022 14:34:04 -0400 |
| parents | 7dc9624e59f7 (current diff) 36b6c48ee6c7 (diff) |
| children | d3b52c8d403c |
| files | init40.gradle |
| diffstat | 3 files changed, 33 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/init40.gradle Mon Aug 22 14:32:18 2022 -0400 +++ b/init40.gradle Mon Aug 22 14:34:04 2022 -0400 @@ -144,6 +144,7 @@ logger.info "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)" println "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)" apply from: "${gradle.ssdtGradlekitLocation}/artifactory40.gradle" +println "Finished applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)" if (!rootProject.hasProperty('disableMetrics')) { println "applying SSDT metrics40.gradle"
--- 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 ->
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/metrics70.gradle Mon Aug 22 14:34:04 2022 -0400 @@ -0,0 +1,28 @@ + +buildscript { + repositories { + maven { url 'https://docker.ssdt.io/artifactory/gradle-plugins' } + maven { url 'https://docker.ssdt.io/artifactory/ssdt-repo' } + } + dependencies { + classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3" + } +} + +apply plugin: org.sonarqube.gradle.SonarQubePlugin + +sonarqube { + properties { + property "sonar.host.url", "http://sonar.ssdt.io:9000" + property "sonar.login", System.getenv('bamboo_SONAR_TOKEN') + property "sonar.exclusions","**/ProjectVersion*" + } +} + +allprojects { + afterEvaluate { project -> + project.getTasksByName('sonarqube',false).each { + it.enabled = gradle.branchStream in ['release'] + } + } +}