sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updating the version.gradle to fix an issue with auto-versioning on the

Browse Source 
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.
This commit is contained in:
Paul Speed 2019-12-21 21:55:47 -05:00
parent 5db3ac4fac
commit b2ae269ede
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@ -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

4
version.gradle
View File

@ -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