🔖 0.15.8 fix rare Gradle version parse bug

ihmcrobotics · Jul 8, 2019 · ed2db05 · ed2db05
1 parent d75ba3f
commit ed2db05
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 27 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "us.ihmc"
-version = "0.15.7"
+version = "0.15.8"
 
 java {
    sourceCompatibility = JavaVersion.VERSION_1_8

diff --git a/src/main/kotlin/us/ihmc/build/Version.kt b/src/main/kotlin/us/ihmc/build/Version.kt
@@ -1,9 +1,11 @@
 package us.ihmc.build
 
-class Version(private val version: String) : Comparable<Version>
+class Version(private val rawVersion: String) : Comparable<Version>
 {
+   private val version = rawVersion.trim().split("-").get(0)
+
    init {
-      if (!version.matches("[0-9]+(\\.[0-9]+)*".toRegex()))
+      if (version.isBlank() || !version.matches("[0-9]+(\\.[0-9]+)*".toRegex()))
          throw IllegalArgumentException("Invalid version format: $version")
    }
 

diff --git a/tests/basicProject/build.gradle b/tests/basicProject/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
    }
 }
 apply plugin: "us.ihmc.ihmc-build"

diff --git a/tests/basicProject/settings.gradle b/tests/basicProject/settings.gradle
@@ -5,7 +5,7 @@ buildscript {
    }
 
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
    }
 }
 

diff --git a/tests/dependsOnSnapshot/build.gradle b/tests/dependsOnSnapshot/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
       classpath "us.ihmc:ihmc-ci-plugin:0.18.0"
    }
 }

diff --git a/tests/dependsOnSnapshot/settings.gradle b/tests/dependsOnSnapshot/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
    }
 }
 

diff --git a/tests/emptyBuildGradleProject/settings.gradle b/tests/emptyBuildGradleProject/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
    }
 }
 

diff --git a/tests/generateTestSuitesTest/build.gradle b/tests/generateTestSuitesTest/build.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
       classpath "us.ihmc:ihmc-ci-plugin:0.18.0"
    }
 }

diff --git a/tests/generateTestSuitesTest/settings.gradle b/tests/generateTestSuitesTest/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
    }
 }
 

diff --git a/tests/multi-project-composite-source-sets/build.gradle.kts b/tests/multi-project-composite-source-sets/build.gradle.kts
@@ -1,3 +1,3 @@
 plugins {
-   id("us.ihmc.ihmc-build") version "0.15.7"
+   id("us.ihmc.ihmc-build") version "0.15.8"
 }
diff --git a/tests/multi-project-composite-source-sets/settings.gradle.kts b/tests/multi-project-composite-source-sets/settings.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath("us.ihmc:ihmc-build:0.15.7")
+      classpath("us.ihmc:ihmc-build:0.15.8")
    }
 }
 

diff --git a/tests/multi-project-composite-source-sets/sub-project-one/build.gradle.kts b/tests/multi-project-composite-source-sets/sub-project-one/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-   id("us.ihmc.ihmc-build") version "0.15.7"
+   id("us.ihmc.ihmc-build") version "0.15.8"
 }
 
 ihmc {

diff --git a/tests/multi-project-composite-source-sets/sub-project-one/settings.gradle.kts b/tests/multi-project-composite-source-sets/sub-project-one/settings.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath("us.ihmc:ihmc-build:0.15.7")
+      classpath("us.ihmc:ihmc-build:0.15.8")
    }
 }
 

diff --git a/tests/multi-project-composite-source-sets/sub-project-three/build.gradle.kts b/tests/multi-project-composite-source-sets/sub-project-three/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-   id("us.ihmc.ihmc-build") version "0.15.7"
+   id("us.ihmc.ihmc-build") version "0.15.8"
 }
 
 ihmc {

diff --git a/tests/multi-project-composite-source-sets/sub-project-three/settings.gradle.kts b/tests/multi-project-composite-source-sets/sub-project-three/settings.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath("us.ihmc:ihmc-build:0.15.7")
+      classpath("us.ihmc:ihmc-build:0.15.8")
    }
 }
 

diff --git a/tests/multi-project-composite-source-sets/sub-project-two/build.gradle.kts b/tests/multi-project-composite-source-sets/sub-project-two/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-   id("us.ihmc.ihmc-build") version "0.15.7"
+   id("us.ihmc.ihmc-build") version "0.15.8"
 }
 
 ihmc {

diff --git a/tests/multi-project-composite-source-sets/sub-project-two/settings.gradle.kts b/tests/multi-project-composite-source-sets/sub-project-two/settings.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath("us.ihmc:ihmc-build:0.15.7")
+      classpath("us.ihmc:ihmc-build:0.15.8")
    }
 }
 

diff --git a/tests/multi-project-inconsistent-excludes/settings.gradle b/tests/multi-project-inconsistent-excludes/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
    }
 }
 

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

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

diff --git a/tests/multi-project/settings.gradle b/tests/multi-project/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
    }
 }
 

diff --git a/tests/multi-project/sub-project-one/settings.gradle b/tests/multi-project/sub-project-one/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
    }
 }
 

diff --git a/tests/multi-project/sub-project-two/settings.gradle b/tests/multi-project/sub-project-two/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
    }
 }
 

diff --git a/tests/oldPublishApiTest/settings.gradle b/tests/oldPublishApiTest/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
    }
 }
 

diff --git a/tests/publishApiTest/settings.gradle b/tests/publishApiTest/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath "us.ihmc:ihmc-build:0.15.7"
+      classpath "us.ihmc:ihmc-build:0.15.8"
    }
 }
 

diff --git a/tests/resource-loading/settings.gradle.kts b/tests/resource-loading/settings.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
       mavenLocal()
    }
    dependencies {
-      classpath("us.ihmc:ihmc-build:0.15.7")
+      classpath("us.ihmc:ihmc-build:0.15.8")
    }
 }