gradle fixes

Author: caustin-ziro

build.gradle

@@ -61,13 +61,11 @@ version = resolveProjectVersion()
 def resolveProjectVersion() {
     def gitDescribe = 'git describe --exact-match HEAD'.execute().text.trim()
     def version = file("${rootDir}/version.txt").text.trim()
-    return gitDescribe ? version : version + '-SNAPSHOT'
+    def branchName = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim()
+    return gitDescribe ? version : branchName + '-SNAPSHOT'
 }
 
 publishing {
-    if (System.getenv().getOrDefault('CI_MODE', 'false') != 'true' && !version.contains('SNAPSHOT')) {
-        throw new GradleException("You are attempting to publish a release from your local environment. Publishing releases is handled by CI")
-    }
     publications {
         maven(MavenPublication) {
             artifact("build/libs/espresso-${version}.jar") {
@@ -90,3 +88,12 @@ publishing {
         }
     }
 }
+
+tasks.withType(PublishToMavenRepository) {
+    def predicate = provider {
+        version.contains('SNAPSHOT') || System.getenv().getOrDefault('CI_MODE', 'false') == 'true'
+    }
+    onlyIf("Artifact is a snapshot or running in CI") {
+        predicate.get()
+    }
+}