From 8323e9cf610ba8be78a6b3b43932b9a6d71d8e81 Mon Sep 17 00:00:00 2001
From: Jeromy Cannon <jeromy@swirldslabs.com>
Date: Wed, 6 Sep 2023 19:56:05 +0100
Subject: [PATCH] switch from jpms module conventions to project level plugin

Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com>
---
 .../main/kotlin/com.hedera.fullstack.conventions.gradle.kts  | 5 +----
 fullstack-alerting-api/build.gradle.kts                      | 1 +
 fullstack-alerting-core/build.gradle.kts                     | 1 +
 fullstack-assertj-extensions/build.gradle.kts                | 1 +
 fullstack-base-api/build.gradle.kts                          | 1 +
 fullstack-configuration-api/build.gradle.kts                 | 1 +
 fullstack-configuration-core/build.gradle.kts                | 1 +
 fullstack-datasource-api/build.gradle.kts                    | 1 +
 fullstack-datasource-core/build.gradle.kts                   | 1 +
 fullstack-examples/build.gradle.kts                          | 5 ++++-
 fullstack-helm-client/build.gradle.kts                       | 1 +
 fullstack-infrastructure-api/build.gradle.kts                | 1 +
 fullstack-infrastructure-core/build.gradle.kts               | 1 +
 fullstack-junit-support/build.gradle.kts                     | 1 +
 fullstack-monitoring-api/build.gradle.kts                    | 1 +
 fullstack-monitoring-core/build.gradle.kts                   | 1 +
 fullstack-readiness-api/build.gradle.kts                     | 5 ++++-
 fullstack-reporting-api/build.gradle.kts                     | 1 +
 fullstack-reporting-core/build.gradle.kts                    | 1 +
 fullstack-resource-generator-api/build.gradle.kts            | 1 +
 fullstack-resource-generator-core/build.gradle.kts           | 1 +
 fullstack-service-locator/build.gradle.kts                   | 1 +
 fullstack-test-toolkit-api/build.gradle.kts                  | 1 +
 fullstack-validator-api/build.gradle.kts                     | 1 +
 fullstack-validator-core/build.gradle.kts                    | 1 +
 project-template/build.gradle.kts                            | 1 +
 26 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/com.hedera.fullstack.conventions.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.fullstack.conventions.gradle.kts
index 225ea692a..2122cf643 100644
--- a/buildSrc/src/main/kotlin/com.hedera.fullstack.conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.fullstack.conventions.gradle.kts
@@ -21,10 +21,7 @@ plugins {
     id("java-library")
     id("jacoco")
 
-    // JPMS Support
-    id("com.hedera.fullstack.jpms-modules")
-
-    // Conventions Plugins
+   // Conventions Plugins
     id("com.hedera.fullstack.spotless-conventions")
     id("com.hedera.fullstack.spotless-java-conventions")
     id("com.hedera.fullstack.spotless-kotlin-conventions")
diff --git a/fullstack-alerting-api/build.gradle.kts b/fullstack-alerting-api/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-alerting-api/build.gradle.kts
+++ b/fullstack-alerting-api/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-alerting-core/build.gradle.kts b/fullstack-alerting-core/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-alerting-core/build.gradle.kts
+++ b/fullstack-alerting-core/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-assertj-extensions/build.gradle.kts b/fullstack-assertj-extensions/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-assertj-extensions/build.gradle.kts
+++ b/fullstack-assertj-extensions/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-base-api/build.gradle.kts b/fullstack-base-api/build.gradle.kts
index 55061079f..c41579f10 100644
--- a/fullstack-base-api/build.gradle.kts
+++ b/fullstack-base-api/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-configuration-api/build.gradle.kts b/fullstack-configuration-api/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-configuration-api/build.gradle.kts
+++ b/fullstack-configuration-api/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-configuration-core/build.gradle.kts b/fullstack-configuration-core/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-configuration-core/build.gradle.kts
+++ b/fullstack-configuration-core/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-datasource-api/build.gradle.kts b/fullstack-datasource-api/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-datasource-api/build.gradle.kts
+++ b/fullstack-datasource-api/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-datasource-core/build.gradle.kts b/fullstack-datasource-core/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-datasource-core/build.gradle.kts
+++ b/fullstack-datasource-core/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-examples/build.gradle.kts b/fullstack-examples/build.gradle.kts
index 47325bb76..f143fe682 100644
--- a/fullstack-examples/build.gradle.kts
+++ b/fullstack-examples/build.gradle.kts
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.fullstack.conventions") }
+plugins {
+    id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
+}
 
 dependencies { api(platform(project(":fullstack-bom"))) }
 
diff --git a/fullstack-helm-client/build.gradle.kts b/fullstack-helm-client/build.gradle.kts
index 05c990029..5f006e31d 100644
--- a/fullstack-helm-client/build.gradle.kts
+++ b/fullstack-helm-client/build.gradle.kts
@@ -18,6 +18,7 @@ import com.hedera.fullstack.gradle.helm.release.HelmArtifactTask
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-infrastructure-api/build.gradle.kts b/fullstack-infrastructure-api/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-infrastructure-api/build.gradle.kts
+++ b/fullstack-infrastructure-api/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-infrastructure-core/build.gradle.kts b/fullstack-infrastructure-core/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-infrastructure-core/build.gradle.kts
+++ b/fullstack-infrastructure-core/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-junit-support/build.gradle.kts b/fullstack-junit-support/build.gradle.kts
index 292fb0dca..4cc5406b5 100644
--- a/fullstack-junit-support/build.gradle.kts
+++ b/fullstack-junit-support/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-monitoring-api/build.gradle.kts b/fullstack-monitoring-api/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-monitoring-api/build.gradle.kts
+++ b/fullstack-monitoring-api/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-monitoring-core/build.gradle.kts b/fullstack-monitoring-core/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-monitoring-core/build.gradle.kts
+++ b/fullstack-monitoring-core/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-readiness-api/build.gradle.kts b/fullstack-readiness-api/build.gradle.kts
index 37ba083c1..fe767f097 100644
--- a/fullstack-readiness-api/build.gradle.kts
+++ b/fullstack-readiness-api/build.gradle.kts
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.fullstack.conventions") }
+plugins {
+    id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
+}
 
 dependencies { api(enforcedPlatform(project(":fullstack-bom"))) }
diff --git a/fullstack-reporting-api/build.gradle.kts b/fullstack-reporting-api/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-reporting-api/build.gradle.kts
+++ b/fullstack-reporting-api/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-reporting-core/build.gradle.kts b/fullstack-reporting-core/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-reporting-core/build.gradle.kts
+++ b/fullstack-reporting-core/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-resource-generator-api/build.gradle.kts b/fullstack-resource-generator-api/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-resource-generator-api/build.gradle.kts
+++ b/fullstack-resource-generator-api/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-resource-generator-core/build.gradle.kts b/fullstack-resource-generator-core/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-resource-generator-core/build.gradle.kts
+++ b/fullstack-resource-generator-core/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-service-locator/build.gradle.kts b/fullstack-service-locator/build.gradle.kts
index 292fb0dca..4cc5406b5 100644
--- a/fullstack-service-locator/build.gradle.kts
+++ b/fullstack-service-locator/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-test-toolkit-api/build.gradle.kts b/fullstack-test-toolkit-api/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-test-toolkit-api/build.gradle.kts
+++ b/fullstack-test-toolkit-api/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-validator-api/build.gradle.kts b/fullstack-validator-api/build.gradle.kts
index 292fb0dca..4cc5406b5 100644
--- a/fullstack-validator-api/build.gradle.kts
+++ b/fullstack-validator-api/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/fullstack-validator-core/build.gradle.kts b/fullstack-validator-core/build.gradle.kts
index 7f18e3e86..557cccaaf 100644
--- a/fullstack-validator-core/build.gradle.kts
+++ b/fullstack-validator-core/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     //    id("com.hedera.fullstack.maven-publish")
 }
 
diff --git a/project-template/build.gradle.kts b/project-template/build.gradle.kts
index 292fb0dca..4cc5406b5 100644
--- a/project-template/build.gradle.kts
+++ b/project-template/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id("com.hedera.fullstack.conventions")
+    id("com.hedera.fullstack.jpms-modules")
     id("com.hedera.fullstack.maven-publish")
 }