# HG changeset patch
# User Marc Davis <marc.davis@mcoecn.org>
# Date 1661193244 14400
# Node ID 2307b12a55e601e7de94c15099a66ac9afb59b1e
# Parent  7dc9624e59f7f693a2c6dfd053eeff18acbd00c7# Parent  36b6c48ee6c756b957273aed0a10ffbeeaabf3cc
merge

diff -r 36b6c48ee6c7 -r 2307b12a55e6 init40.gradle
--- a/init40.gradle	Wed Jul 20 14:38:11 2022 +0100
+++ b/init40.gradle	Mon Aug 22 14:34:04 2022 -0400
@@ -138,14 +138,13 @@
 println "Indy available: ${rootProject.indyCapable()} enabled: ${rootProject.useIndy()}"
 
 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"
@@ -260,6 +259,10 @@
         }
     }
 
+    if (!gradle.bambooBuild) {
+        artifactoryPublish.skip = true
+    }
+
 }
 
 subprojects {