🔖 0.15.6, fix importing settings kts files

ihmcrobotics · Feb 20, 2019 · 1ec575c · 1ec575c
1 parent c53d461
commit 1ec575c
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 18 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "us.ihmc"
-version = "0.15.5"
+version = "0.15.6"
 
 java {
    sourceCompatibility = JavaVersion.VERSION_1_8

diff --git a/src/main/kotlin/us/ihmc/build/IHMCCompositeBuildAssembler.kt b/src/main/kotlin/us/ihmc/build/IHMCCompositeBuildAssembler.kt
@@ -194,7 +194,8 @@ class IHMCCompositeBuildAssembler(val configurator: IHMCSettingsConfigurator)
             && (subdirectory.fileName != null && subdirectory.fileName.toString() != "out")
             && (Files.exists(subdirectory.resolve("build.gradle")) || Files.exists(subdirectory.resolve("build.gradle.kts")))
             && Files.exists(subdirectory.resolve("gradle.properties"))
-            && Files.exists(subdirectory.resolve("settings.gradle")))
+            && (Files.exists(subdirectory.resolve("settings.gradle")) || Files.exists(subdirectory.resolve("settings.gradle.kts")))
+            )
    }
 
    private fun matchNames(buildFolderNameToCheck: String, dependencyNameAsDeclared: String): Boolean

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
       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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
       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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5"
+      classpath "us.ihmc:ihmc-build:0.15.6"
    }
 }
 

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.5")
+      classpath("us.ihmc:ihmc-build:0.15.6")
    }
 }