From b2ae269ede44328a593cd76bd978b90b1e863805 Mon Sep 17 00:00:00 2001 From: Paul Speed Date: Sat, 21 Dec 2019 21:55:47 -0500 Subject: [PATCH] Updating the version.gradle to fix an issue with auto-versioning on the master branch. (On master we want to default to the gradle.properties version and not the latest tag for non-specific-commit tags.) Updated gradle.properties to set master to be 3.4.0 for further development. --- gradle.properties | 6 +++--- version.gradle | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index a0bb43ad5..035c54713 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ # Version number: Major.Minor.SubMinor (e.g. 3.3.0) -jmeVersion = 3.3.0 +jmeVersion = 3.4.0 # Leave empty to autogenerate # (use -PjmeVersionName="myVersion" from commandline to specify a custom version name ) -jmeVersionName = +jmeVersionName = # If true, the version name will contain the commit hash useCommitHashAsVersionName = false -# Set to true if a non-master branch name should be included in the automatically +# Set to true if a non-master branch name should be included in the automatically # generated version. includeBranchInVersion = false diff --git a/version.gradle b/version.gradle index a80c911dd..637b5ff72 100644 --- a/version.gradle +++ b/version.gradle @@ -81,8 +81,8 @@ task configureVersionInfo { // Parse out just the base version part. -SNAPSHOT versions // shouldn't really include our release suffixes - def baseVersion = (tagVersion =~/(\d+\.\d+.\d+)/) - baseVersion = baseVersion.size() > 0 ? baseVersion[0][0] : tagVersion + def baseVersion = (jmeVersion =~/(\d+\.\d+.\d+)/) + baseVersion = baseVersion.size() > 0 ? baseVersion[0][0] : jmeVersion if( !jmeVersionName ) { // If there is a specific tag for the top commit then we always