Merge branch 'master' into develop

KayMD · KayMD · commit 82858f253e66 · 2020-11-29T11:25:09.000-05:00
# Conflicts:
#	versions.gradle
diff --git a/build.gradle b/build.gradle
@@ -64,8 +64,8 @@ allprojects {
         }
 
         if (branch == 'master') {
-            if (indexOfSeparator > -1) {
-                throw new RuntimeException("Can't build snapshot in master branch.")
+            if (indexOfSeparator > (-1)) {
+                throw new RuntimeException("Can't build snapshot in master branch: " + gitVersion)
             }
         } else {
             mainVersion += '-SNAPSHOT'

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ allprojects {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if (branch == 'master') {`
`67`		`- if (indexOfSeparator > -1) {`
`68`		`- throw new RuntimeException("Can't build snapshot in master branch.")`
	`67`	`+ if (indexOfSeparator > (-1)) {`
	`68`	`+ throw new RuntimeException("Can't build snapshot in master branch: " + gitVersion)`
`69`	`69`	`}`
`70`	`70`	`} else {`
`71`	`71`	`mainVersion += '-SNAPSHOT'`