changeset 293:d3b52c8d403c

revert changes
author Marc Davis <marc.davis@mcoecn.org>
date Mon, 22 Aug 2022 14:37:14 -0400
parents 2307b12a55e6
children 7e2674a90f49 ca537e63716d
files init40.gradle
diffstat 1 files changed, 5 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/init40.gradle	Mon Aug 22 14:34:04 2022 -0400
+++ b/init40.gradle	Mon Aug 22 14:37:14 2022 -0400
@@ -139,12 +139,12 @@
 
 if (gradle.bambooBuild) {
     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)"
+    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)"
 }
-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)"
-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"
@@ -258,11 +258,6 @@
             }
         }
     }
-
-    if (!gradle.bambooBuild) {
-        artifactoryPublish.skip = true
-    }
-
 }
 
 subprojects {