Use the SetupBuilderVersion.gradle

To make sure we’re usingf the same version consistently in the project.

Author: gamma

SetupBuilderVersion.gradle

@@ -1,6 +1,6 @@
 
 import org.gradle.util.VersionNumber
-ext.setupBuilderVersion = { 
+ext.setupBuilderVersion = { buildVersion = '+' ->
 
     def baseVersion = '2.0'                                                 // Base Version to build, depends on gradle version.
     def version = baseVersion
@@ -13,5 +13,5 @@ ext.setupBuilderVersion = {
     if( gVersion >= VersionNumber.parse( '3.4' ) ) version = '3.4'
     if( gVersion >= VersionNumber.parse( '4.2' ) ) version = '4.2'
     if( gVersion >= VersionNumber.parse( '4.5' ) ) version = '4.5'
-    return version + '.+'
+    return version + '.' + buildVersion
 }

build.gradle

@@ -15,21 +15,12 @@ def buildVersion = '3c'                                                  // buil
 def baseVersion = '4.5'                                                  // Base Version to build, depends on gradle version.
 
 wrapper.gradleVersion = LIB_GRADLE_VERSION
-
-version = baseVersion
-
-// gradle version switch, depends the API level
-println 'Gradle version: ' + gradle.gradleVersion
-import org.gradle.util.VersionNumber
 def gVersion = VersionNumber.parse( gradle.gradleVersion )
-if( gVersion < VersionNumber.parse( '3.0' ) ) version = '2.0'
-if( gVersion >= VersionNumber.parse( '3.0' ) ) version = '3.0'
-if( gVersion >= VersionNumber.parse( '3.1' ) ) version = '3.1'
-if( gVersion >= VersionNumber.parse( '3.4' ) ) version = '3.4'
-if( gVersion >= VersionNumber.parse( '4.2' ) ) version = '4.2'
-if( gVersion >= VersionNumber.parse( '4.5' ) ) version = '4.5'          // Current baseVersion for development
-
-version += '.' + buildVersion
+println 'Gradle version: ' + gVersion
+
+// Fetch version from script.
+apply from: "${buildscript.sourceFile.parentFile}/SetupBuilderVersion.gradle"
+version = setupBuilderVersion(buildVersion)
 baseVersion += '.' + buildVersion
 println 'SetupBuilder version: ' + version
 

testBuilds/appBundler.gradle

@@ -1,21 +1,16 @@
-/*
-plugins {
-    id "de.inetsoftware.setupbuilder" version "3.4.3"
-}
-/*/
 buildscript {
     repositories {
         maven {
             url uri('../../repo')
         }
     }
     dependencies {
-        classpath 'de.inetsoftware:SetupBuilder:+'
+        apply from: "${buildscript.sourceFile.parentFile}/../SetupBuilderVersion.gradle"
+        classpath 'de.inetsoftware:SetupBuilder:' + setupBuilderVersion()
     }
 }
 
 apply plugin: 'de.inetsoftware.appbundler'
-//*/
 
 apply plugin: 'java'
 

testBuilds/jnlpBundler.gradle

@@ -1,21 +1,16 @@
-/*
-plugins {
-    id "de.inetsoftware.setupbuilder" version "3.4.3"
-}
-/*/
 buildscript {
     repositories {
         maven {
             url uri('../../repo')
         }
     }
     dependencies {
-        classpath 'de.inetsoftware:SetupBuilder:+'
+        apply from: "${buildscript.sourceFile.parentFile}/../SetupBuilderVersion.gradle"
+        classpath 'de.inetsoftware:SetupBuilder:' + setupBuilderVersion()
     }
 }
 
 apply plugin: 'de.inetsoftware.appbundler'
-//*/
 
 appBundler {
 

testBuilds/setupBuilder.gradle

@@ -1,17 +1,12 @@
-/*
-plugins {
-    id "de.inetsoftware.setupbuilder" version "3.4.3"
-}
-/*/
 buildscript {
-    
     repositories {
         maven {
             url uri('../../repo')
         }
     }
     dependencies {
-        classpath 'de.inetsoftware:SetupBuilder:+'
+        apply from: "${buildscript.sourceFile.parentFile}/../SetupBuilderVersion.gradle"
+        classpath 'de.inetsoftware:SetupBuilder:' + setupBuilderVersion()
     }
 }
 
@@ -22,7 +17,6 @@ repositories {
 }
 
 apply plugin: 'de.inetsoftware.setupbuilder'
-//*/
 
 apply plugin: 'java'