🔖 0.15.3, Add proper semantic version comparison.

ihmcrobotics · Oct 26, 2018 · 8e9f8fd · 8e9f8fd
1 parent d98a5e9
commit 8e9f8fd
Show file tree

Hide file tree

Showing 27 changed files with 77 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 
@@ -68,7 +68,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"
@@ -157,7 +157,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 
@@ -177,7 +177,7 @@ buildscript {
       jcenter()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "us.ihmc"
-version = "0.15.2"
+version = "0.15.3"
 
 pluginBundle {
    website = "https://github.com/ihmcrobotics/ihmc-build"

diff --git a/src/main/kotlin/us/ihmc/build/IHMCSettingsConfigurator.kt b/src/main/kotlin/us/ihmc/build/IHMCSettingsConfigurator.kt
@@ -21,7 +21,7 @@ class IHMCSettingsConfigurator(val settings: Settings, val logger: Logger, val e
       logInfo(logger, "Evaluating " + settings.rootProject.projectDir.toPath().fileName.toString() + " settings.gradle")
       ext["org.gradle.workers.max"] = 200
 
-      if (settings.gradle.gradleVersion.compareTo("4.8") < 0)
+      if (Version(settings.gradle.gradleVersion).compareTo(Version("4.8")) < 0)
       {
          val message = "Please upgrade to Gradle version 4.8 or higher! (Recommended versions: 4.10.2 or later)"
          logError(logger, message)

diff --git a/src/main/kotlin/us/ihmc/build/Version.kt b/src/main/kotlin/us/ihmc/build/Version.kt
@@ -0,0 +1,48 @@
+package us.ihmc.build
+
+class Version(private val version: String) : Comparable<Version>
+{
+   init {
+      if (!version.matches("[0-9]+(\\.[0-9]+)*".toRegex()))
+         throw IllegalArgumentException("Invalid version format: $version")
+   }
+
+   fun get(): String
+   {
+      return this.version
+   }
+
+   override operator fun compareTo(that: Version): Int
+   {
+      if (that == null)
+         return 1
+      val thisParts = this.get().split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+      val thatParts = that.get().split("\\.".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+      val length = Math.max(thisParts.size, thatParts.size)
+      for (i in 0 until length)
+      {
+         val thisPart = if (i < thisParts.size)
+            Integer.parseInt(thisParts[i])
+         else
+            0
+         val thatPart = if (i < thatParts.size)
+            Integer.parseInt(thatParts[i])
+         else
+            0
+         if (thisPart < thatPart)
+            return -1
+         if (thisPart > thatPart)
+            return 1
+      }
+      return 0
+   }
+
+   override fun equals(that: Any?): Boolean
+   {
+      if (this === that)
+         return true
+      if (that == null)
+         return false
+      return if (this.javaClass != that.javaClass) false else this.compareTo(that as Version) == 0
+   }
+}
diff --git a/src/test/builds/basicProject/build.gradle b/src/test/builds/basicProject/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"

diff --git a/src/test/builds/basicProject/settings.gradle b/src/test/builds/basicProject/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 

diff --git a/src/test/builds/dependsOnSnapshot/build.gradle b/src/test/builds/dependsOnSnapshot/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
       classpath "us.ihmc:ihmc-ci-plugin:0.18.0"
    }
 }

diff --git a/src/test/builds/dependsOnSnapshot/settings.gradle b/src/test/builds/dependsOnSnapshot/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 

diff --git a/src/test/builds/emptyBuildGradleProject/settings.gradle b/src/test/builds/emptyBuildGradleProject/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 

diff --git a/src/test/builds/generateTestSuitesTest/build.gradle b/src/test/builds/generateTestSuitesTest/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
       classpath "us.ihmc:ihmc-ci-plugin:0.18.0"
    }
 }

diff --git a/src/test/builds/generateTestSuitesTest/settings.gradle b/src/test/builds/generateTestSuitesTest/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 

diff --git a/src/test/builds/multi-project-inconsistent-excludes/build.gradle b/src/test/builds/multi-project-inconsistent-excludes/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"
diff --git a/src/test/builds/multi-project-inconsistent-excludes/settings.gradle b/src/test/builds/multi-project-inconsistent-excludes/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 

diff --git a/src/test/builds/multi-project-inconsistent-excludes/sub-project-one/build.gradle b/src/test/builds/multi-project-inconsistent-excludes/sub-project-one/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"

diff --git a/src/test/builds/multi-project-inconsistent-excludes/sub-project-one/settings.gradle b/src/test/builds/multi-project-inconsistent-excludes/sub-project-one/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 

diff --git a/src/test/builds/multi-project-inconsistent-excludes/sub-project-two/build.gradle b/src/test/builds/multi-project-inconsistent-excludes/sub-project-two/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"

diff --git a/src/test/builds/multi-project-inconsistent-excludes/sub-project-two/settings.gradle b/src/test/builds/multi-project-inconsistent-excludes/sub-project-two/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 

diff --git a/src/test/builds/multi-project/build.gradle b/src/test/builds/multi-project/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"
diff --git a/src/test/builds/multi-project/settings.gradle b/src/test/builds/multi-project/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 

diff --git a/src/test/builds/multi-project/sub-project-one/build.gradle b/src/test/builds/multi-project/sub-project-one/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"

diff --git a/src/test/builds/multi-project/sub-project-one/settings.gradle b/src/test/builds/multi-project/sub-project-one/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 

diff --git a/src/test/builds/multi-project/sub-project-two/build.gradle b/src/test/builds/multi-project/sub-project-two/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"

diff --git a/src/test/builds/multi-project/sub-project-two/settings.gradle b/src/test/builds/multi-project/sub-project-two/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 

diff --git a/src/test/builds/oldPublishApiTest/build.gradle b/src/test/builds/oldPublishApiTest/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"

diff --git a/src/test/builds/oldPublishApiTest/settings.gradle b/src/test/builds/oldPublishApiTest/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 

diff --git a/src/test/builds/publishApiTest/build.gradle b/src/test/builds/publishApiTest/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"

diff --git a/src/test/builds/publishApiTest/settings.gradle b/src/test/builds/publishApiTest/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.2"
+      classpath "us.ihmc:ihmc-build:0.15.3"
    }
 }