From cd529394c98a077e549b2a7596e51a58e1cb6cfc Mon Sep 17 00:00:00 2001 From: Renaud Pawlak Date: Wed, 2 Aug 2017 18:04:31 +0200 Subject: [PATCH] better version update --- .../java/org/jsweet/publisher/visitor/UpdateVersion.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/candy-generator/src/main/java/org/jsweet/publisher/visitor/UpdateVersion.java b/candy-generator/src/main/java/org/jsweet/publisher/visitor/UpdateVersion.java index b4d25795..f3c9153e 100644 --- a/candy-generator/src/main/java/org/jsweet/publisher/visitor/UpdateVersion.java +++ b/candy-generator/src/main/java/org/jsweet/publisher/visitor/UpdateVersion.java @@ -12,16 +12,20 @@ public class UpdateVersion implements FileVisitor { String version; String transpilerVersion; + String transpilerCoreVersion; Pattern artifactVersionPattern = Pattern.compile("(\\d*.\\d*.\\d*-)(\\w*)(\\s*)"); Pattern versionPattern = Pattern.compile("(\\d*.\\d*.\\d*-)(\\w*)()"); Pattern coreVersionPattern = Pattern.compile("(\\d*-)(\\w*)()"); Pattern transpilerVersionPattern = Pattern - .compile("(jsweet-maven-plugin\\s*\\d*.\\d*.\\d*-)(\\w*)()"); + .compile("(jsweet-maven-plugin\\s*)(\\d*.\\d*.\\d*-\\w*)()"); + Pattern transpilerVersionPropertyPattern = Pattern + .compile("()(\\d*.\\d*.\\d*)()"); public UpdateVersion(String version, String transpilerVersion) { this.version = version; this.transpilerVersion = transpilerVersion; + this.transpilerCoreVersion = transpilerVersion.split("-")[0]; } int count = 0; @@ -46,6 +50,8 @@ public class UpdateVersion implements FileVisitor { content = m.replaceAll("$1" + version + "$3"); m = coreVersionPattern.matcher(content); content = m.replaceAll("$1" + version + "$3"); + m = transpilerVersionPropertyPattern.matcher(content); + content = m.replaceAll("$1" + transpilerCoreVersion + "$3"); m = transpilerVersionPattern.matcher(content); content = m.replaceAll("$1" + transpilerVersion + "$3"); FileUtils.writeStringToFile(file, content);