Version system

Author: freds

build-info-extractor-gradle/gradle.properties

@@ -19,26 +19,23 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 // Root project version should not be used
 version='2'
+baseProjectNames = ['api','client','extractor']
 
 allprojects {
     apply plugin: 'idea'
     group = 'org.jfrog.buildinfo'
 }
 
 def baseProjects() {
-    subprojects.findAll { !it.name.startsWith('extractor-') }
-}
-
-def extractorProjects() {
-    subprojects.findAll { it.name.startsWith('extractor-') }
+    subprojects.findAll { p -> baseProjectNames.contains(p.name) }
 }
 
 subprojects {
     apply plugin: 'maven'
     apply plugin: 'java'
     sourceCompatibility = 1.5
     targetCompatibility = 1.5
-    buildInfoVersion = new Version(rootProject)
+    buildInfoVersion = new Version(rootProject, '1.4.9', false, baseProjectNames)
     artifactId = "build-info-$name"
 
     dependencies {
@@ -61,9 +58,11 @@ configure(baseProjects()) {
     test.useTestNG()
 }
 
+/*
 configure(extractorProjects()) { p ->
     version = new Version(p)
 }
+*/
 
 project('api') {
     description = 'JFrog Build-Info API'
@@ -87,6 +86,7 @@ project('extractor') {
 }
 
 project('extractor-ivy') {
+    version = new Version(project, '1.0.5', false)
     description = 'JFrog Build-Info Ivy Extractor'
     dependencies {
         compile project(':extractor')
@@ -107,6 +107,7 @@ project('extractor-ivy') {
 project('extractor-gradle') {
     apply plugin: 'groovy'
 
+    version = new Version(project, '1.0.6', false)
     description = 'JFrog Build-Info Gradle Extractor'
 
     dependencies {
@@ -132,6 +133,7 @@ project('extractor-gradle') {
 }
 
 project('extractor-maven3') {
+    version = new Version(project, '1.0.4', false)
     description = 'JFrog Build-Info Maven 3 Extractor'
 
     dependencies {

build-info-extractor-ivy/gradle.properties

@@ -1,61 +1,77 @@
 package org.jfrog.build
 
-import java.text.SimpleDateFormat
 import org.gradle.api.GradleException
 import org.gradle.api.Project
+import java.text.SimpleDateFormat
 
 class Version {
-  String versionNumber
-  Date buildTime
-  Boolean release = null
+    String versionNumber
+    Date buildTime
+    Boolean release = null
 
-  def Version(Project project) {
-    this.versionNumber = project.nextVersion
-    this.release = Boolean.parseBoolean(project.isRelease)
-    File timestampFile = new File(project.buildDir, 'timestamp.txt')
-    if (timestampFile.isFile()) {
-      boolean uptodate = true
-      def modified = timestampFile.lastModified()
-      project.fileTree('src/main').visit {fte ->
-        if (fte.file.isFile() && fte.lastModified > modified) {
-          uptodate = false
-          fte.stopVisiting()
-        }
-      }
-      if (!uptodate) {
-        timestampFile.setLastModified(new Date().time)
-      }
-    } else {
-      timestampFile.parentFile.mkdirs()
-      timestampFile.createNewFile()
+    def Version(Project project, String versionNumber, boolean isRelease) {
+        this(project, versionNumber, isRelease, null)
     }
-    buildTime = new Date(timestampFile.lastModified())
-    if (!release)
-      this.versionNumber += "-" + getTimestamp()
-    /*
-            project.gradle.taskGraph.whenReady {graph ->
-                if (graph.hasTask(':releaseVersion')) {
-                    release = true
-                } else {
-                    this.versionNumber += "-" + getTimestamp()
-                    release = false
+
+    def Version(Project project, String versionNumber, boolean isRelease, List<String> subProjects) {
+        this.versionNumber = versionNumber
+        this.release = isRelease
+        File timestampFile = new File(project.buildDir, 'timestamp.txt')
+        if (timestampFile.isFile()) {
+            boolean uptodate = true
+            def modified = timestampFile.lastModified()
+            if (subProjects != null) {
+                // Check timestamp by list of subprojects
+                subProjects.each { spName ->
+                    project.project(spName).fileTree('src/main').visit {fte ->
+                        if (fte.file.isFile() && fte.lastModified > modified) {
+                            uptodate = false
+                            fte.stopVisiting()
+                        }
+                    }
+                }
+            } else {
+                project.fileTree('src/main').visit {fte ->
+                    if (fte.file.isFile() && fte.lastModified > modified) {
+                        uptodate = false
+                        fte.stopVisiting()
+                    }
                 }
             }
-    */
-  }
+            if (!uptodate) {
+                timestampFile.setLastModified(new Date().time)
+            }
+        } else {
+            timestampFile.parentFile.mkdirs()
+            timestampFile.createNewFile()
+        }
+        buildTime = new Date(timestampFile.lastModified())
+        if (!release)
+            this.versionNumber += "-" + getTimestamp()
+        /*
+                project.gradle.taskGraph.whenReady {graph ->
+                    if (graph.hasTask(':releaseVersion')) {
+                        release = true
+                    } else {
+                        this.versionNumber += "-" + getTimestamp()
+                        release = false
+                    }
+                }
+        */
+    }
 
-  String toString() {
-    versionNumber
-  }
+    String toString() {
+        versionNumber
+    }
 
-  String getTimestamp() {
-    new SimpleDateFormat('yyyyMMddHHmmssZ').format(buildTime)
-  }
+    String getTimestamp() {
+        new SimpleDateFormat('yyyyMMddHHmmssZ').format(buildTime)
+    }
 
-  boolean isRelease() {
-    if (release == null) {
-      throw new GradleException("Can't determine whether this is a release build before the task graph is populated")
+    boolean isRelease() {
+        if (release == null) {
+            throw new GradleException("Can't determine whether this is a release build before the task graph is populated")
+        }
+        return release
     }
-    return release
-  }
 }