Merge Version-1.2

schlegel11 · Jan 5, 2018 · 2255126 · 2255126
2 parents 93233b6 + 2ba329e
commit 2255126
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -132,7 +132,7 @@ publishing {
                     if (it.file.name.endsWith('.tar.gz.asc')) {
                         // Workaround in case a tar.gz file should published
                         type = 'tar.gz.asc'
-                    } else if (it.type.equals('xml.asc')) {  // Set correct extension for signature of pom file
+                    } else if (it.type == 'xml.asc') {  // Set correct extension for signature of pom file
                         type = 'pom.asc'
                     }
                     artifact source: it.file, classifier: it.classifier ?: null, extension: type

diff --git a/gitCommands.gradle b/gitCommands.gradle
@@ -58,18 +58,18 @@ ext.git = [
 
         hasBranch                  : { branch ->
             def result = gitCommand("branch")
-            Pattern p = Pattern.compile("(${branch}\\b)");
-            Matcher m = p.matcher(result);
+            Pattern p = Pattern.compile("(${branch}\\b)")
+            Matcher m = p.matcher(result)
             m.find()
         },
 
         hasFiles                   : { ... files ->
             try {
                 gitCommand("ls-files", "--error-unmatch", files.join(','))
             } catch (ignored) {
-                return false;
+                return false
             }
-            return true;
+            return true
         },
 
         getModifiedFiles           : { ... paths ->
@@ -86,8 +86,8 @@ ext.git = [
 
         hasTag                     : { tag ->
             def result = gitCommand("tag")
-            Pattern p = Pattern.compile("(${tag}\\b)");
-            Matcher m = p.matcher(result);
+            Pattern p = Pattern.compile("(${tag}\\b)")
+            Matcher m = p.matcher(result)
             m.find()
         }
 ]