From cb8a8040622a230c6e2f69c7c685111867a3232a Mon Sep 17 00:00:00 2001
From: Paul Harrison <paul.harrison@manchester.ac.uk>
Date: Fri, 26 Apr 2024 18:22:03 +0100
Subject: [PATCH] rearrange the project inclusion structure

---
 build.gradle.kts                                      | 10 +++++-----
 settings.gradle.kts                                   |  4 ++--
 tools/gradletooling/gradle-plugin/build.gradle.kts    |  2 +-
 tools/gradletooling/gradle-plugin/settings.gradle.kts |  1 +
 tools/gradletooling/{ => sample}/settings.gradle.kts  |  9 +++------
 5 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 tools/gradletooling/gradle-plugin/settings.gradle.kts
 rename tools/gradletooling/{ => sample}/settings.gradle.kts (59%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7496cafb..1e195346 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,10 +1,10 @@
 //IMPL cannot get this composite build to work - have resorted to sequence of commands in github CI
 
-tasks.register("doAll"){
-    dependsOn(gradle.includedBuild("ivoa").task(":jar"))
-    finalizedBy(gradle.includedBuild("gradletooling").task(":vodml-sample:test"))
-    description = "builds and installs the runtime library and then runs unit tests on code generated from sample model"
-}
+//tasks.register("doAll"){
+//    dependsOn(gradle.includedBuild("ivoa").task(":jar"))
+//    finalizedBy(gradle.includedBuild("gradletooling").task(":vodml-sample:test"))
+//    description = "builds and installs the runtime library and then runs unit tests on code generated from sample model"
+//}
 
 // would like rto do something like this
 //tasks.register<GradleBuild>("doAll"){
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d02934f6..426f253c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,7 +1,7 @@
 /*
 this is an empty umbrella build to include the various component builds
  */
-
+rootProject.name="vodml"
 includeBuild("runtime/java") //fixed code needed by the generated code for java
 includeBuild("models/ivoa") // the ivoa base model
-includeBuild("tools/gradletooling") //gradle plugin
+includeBuild("tools/gradletooling/sample") //sample project
diff --git a/tools/gradletooling/gradle-plugin/build.gradle.kts b/tools/gradletooling/gradle-plugin/build.gradle.kts
index b6680c89..8782ed62 100644
--- a/tools/gradletooling/gradle-plugin/build.gradle.kts
+++ b/tools/gradletooling/gradle-plugin/build.gradle.kts
@@ -73,7 +73,7 @@ gradlePlugin {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(11))//NB needs to stay at 11 for gradle plugin ATM
     }
 }
 
diff --git a/tools/gradletooling/gradle-plugin/settings.gradle.kts b/tools/gradletooling/gradle-plugin/settings.gradle.kts
new file mode 100644
index 00000000..143213b7
--- /dev/null
+++ b/tools/gradletooling/gradle-plugin/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name="gradle-plugin"
\ No newline at end of file
diff --git a/tools/gradletooling/settings.gradle.kts b/tools/gradletooling/sample/settings.gradle.kts
similarity index 59%
rename from tools/gradletooling/settings.gradle.kts
rename to tools/gradletooling/sample/settings.gradle.kts
index 986ede44..76c44f3c 100644
--- a/tools/gradletooling/settings.gradle.kts
+++ b/tools/gradletooling/sample/settings.gradle.kts
@@ -5,7 +5,7 @@ pluginManagement {
         gradlePluginPortal()
         mavenCentral()
     }
-    includeBuild("gradle-plugin") //get the gradle plugin
+    includeBuild("../gradle-plugin") //get the gradle plugin
 }
 
 // == Define locations for components ==
@@ -16,8 +16,5 @@ dependencyResolutionManagement {
     }
 
 }
-includeBuild("../../models/ivoa")
-rootProject.name="gradletooling"
-include("sample")
-
-project(":sample").name = "vodml-sample"
+includeBuild("../../../models/ivoa")
+rootProject.name="vodml-sample"