From ca93a43a6f064ccbc5153a78f65828a3207176e9 Mon Sep 17 00:00:00 2001 From: Roopa Mohan Date: Fri, 10 Jun 2022 16:36:14 -0700 Subject: [PATCH 1/2] Adding cli-messaging to sfge and pmd-cataloger so that they can be built and developed independently --- pmd-cataloger/settings.gradle.kts | 3 +++ settings.gradle.kts | 4 +--- sfge/settings.gradle.kts | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pmd-cataloger/settings.gradle.kts b/pmd-cataloger/settings.gradle.kts index 99ffef2c9..9ea44c98e 100644 --- a/pmd-cataloger/settings.gradle.kts +++ b/pmd-cataloger/settings.gradle.kts @@ -1,2 +1,5 @@ rootProject.name = "pmd-cataloger" +include(":cli-messaging") +project(":cli-messaging").projectDir = file("../cli-messaging") + diff --git a/settings.gradle.kts b/settings.gradle.kts index e9eead571..89468d0d5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,6 +7,4 @@ rootProject.name = "sfdx-scanner" -include("cli-messaging") -include("pmd-cataloger") -include("sfge") +include(":cli-messaging", ":pmd-cataloger", ":sfge") diff --git a/sfge/settings.gradle.kts b/sfge/settings.gradle.kts index 2a5845a37..4239bd015 100644 --- a/sfge/settings.gradle.kts +++ b/sfge/settings.gradle.kts @@ -1 +1,4 @@ rootProject.name = "sfge" + +include(":cli-messaging") +project(":cli-messaging").projectDir = file("../cli-messaging") From 7f5a7c5fe12cd88b6ed682901cfcbb0bcaf2c6f7 Mon Sep 17 00:00:00 2001 From: Roopa Mohan Date: Mon, 13 Jun 2022 11:56:38 -0700 Subject: [PATCH 2/2] Removing settings.gradle on subprojects to keep up with gradle standards of having a single root in a nested system --- pmd-cataloger/settings.gradle.kts | 5 ----- sfge/settings.gradle.kts | 4 ---- 2 files changed, 9 deletions(-) delete mode 100644 pmd-cataloger/settings.gradle.kts delete mode 100644 sfge/settings.gradle.kts diff --git a/pmd-cataloger/settings.gradle.kts b/pmd-cataloger/settings.gradle.kts deleted file mode 100644 index 9ea44c98e..000000000 --- a/pmd-cataloger/settings.gradle.kts +++ /dev/null @@ -1,5 +0,0 @@ -rootProject.name = "pmd-cataloger" - -include(":cli-messaging") -project(":cli-messaging").projectDir = file("../cli-messaging") - diff --git a/sfge/settings.gradle.kts b/sfge/settings.gradle.kts deleted file mode 100644 index 4239bd015..000000000 --- a/sfge/settings.gradle.kts +++ /dev/null @@ -1,4 +0,0 @@ -rootProject.name = "sfge" - -include(":cli-messaging") -project(":cli-messaging").projectDir = file("../cli-messaging")