From 533bdba0626cc3b904f82a06d72adea104f25d09 Mon Sep 17 00:00:00 2001 From: Miguel Mathus Date: Wed, 20 May 2020 19:15:08 -0600 Subject: [PATCH] fixing typo in version --- gradle/version | 2 +- gradle/version.gradle | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gradle/version b/gradle/version index 8506bebc..0f8203c2 100644 --- a/gradle/version +++ b/gradle/version @@ -1 +1 @@ -4.1.0-bf4c87fdedb98bc02cb305ac9d94740e1c9fc8a4-a025e5783c642b67afda2a32f63a7d5d1ea17ed6 +4.1.0-2faf885816f286b1d7feb581a90fd0ba38488f73-2faf885816f286b1d7feb581a90fd0ba38488f73 \ No newline at end of file diff --git a/gradle/version.gradle b/gradle/version.gradle index c47e9913..cce6676d 100644 --- a/gradle/version.gradle +++ b/gradle/version.gradle @@ -34,9 +34,7 @@ ext { // isSnapshot = describedCommit.matches(".*-[0-9]+-g[0-9a-f]{7}") // version = describedCommit.replaceAll("(.*)-[0-9]+-g[0-9a-f]{7}(.*)", '$1$2') + (isSnapshot ? "-SNAPSHOT" : "") - if(rev != revision){ - String minor=version.substring(version.lastIndexOf('.')); - version = version.substring(0,version.lastIndexOf('.'))+"."+minor; + if(rev != revision){ File file = new File("gradle/version") file.write(version+"-"+revision+"-"+masterRevision) println file.text