From 13c1b882c8451a8d7d3b15f8acf3307d13075d72 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 12 Feb 2021 18:36:10 -0500
Subject: [PATCH] Better organize the loaded modules in Android Studio

---
 .github/workflows/build_pull_request.yml | 2 --
 .github/workflows/build_push.yml         | 2 --
 .github/workflows/issue_closer.yml       | 2 ++
 settings.gradle.kts                      | 9 ++++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index 5794f77e5..eb68ff377 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -7,7 +7,6 @@ jobs:
   check_wrapper:
     name: Validate Gradle Wrapper
     runs-on: ubuntu-latest
-
     steps:
       - name: Clone repo
         uses: actions/checkout@v2
@@ -20,7 +19,6 @@ jobs:
     needs: check_wrapper
     if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout PR
         uses: actions/checkout@v2
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 8ce3c5e0c..3ac730a7d 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -9,7 +9,6 @@ jobs:
   check_wrapper:
     name: Validate Gradle Wrapper
     runs-on: ubuntu-latest
-
     steps:
       - name: Clone repo
         uses: actions/checkout@v2
@@ -22,7 +21,6 @@ jobs:
     needs: check_wrapper
     if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
     runs-on: ubuntu-latest
-
     steps:
       - name: Cancel previous runs
         uses: styfle/cancel-workflow-action@0.5.0
diff --git a/.github/workflows/issue_closer.yml b/.github/workflows/issue_closer.yml
index bd5fca459..0ac22288e 100644
--- a/.github/workflows/issue_closer.yml
+++ b/.github/workflows/issue_closer.yml
@@ -1,7 +1,9 @@
 name: Issue closer
+
 on:
   issues:
     types: [opened, edited, reopened]
+
 jobs:
   autoclose:
     runs-on: ubuntu-latest
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 77558de40..5621f86bd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ project(":multisrc").projectDir = File("multisrc")
 // Loads all extensions
 File(rootDir, "src").eachDir { dir ->
     dir.eachDir { subdir ->
-        val name = ":${dir.name}-${subdir.name}"
+        val name = ":individual:${dir.name}:${subdir.name}"
         include(name)
         project(name).projectDir = File("src/${dir.name}/${subdir.name}")
     }
@@ -24,13 +24,16 @@ File(rootDir, "src").eachDir { dir ->
 // Loads generated extensions from multisrc
 File(rootDir, "generated-src").eachDir { dir ->
     dir.eachDir { subdir ->
-        val name = ":${dir.name}-${subdir.name}"
+        val name = ":theme:${dir.name}:${subdir.name}"
         include(name)
         project(name).projectDir = File("generated-src/${dir.name}/${subdir.name}")
     }
 }
 
-// Use this to load a single extension during development
+/**
+ * If you're developing locally and only want to work with a single module,
+ * comment out the parts above and uncomment below.
+ */
 // val lang = "all"
 // val name = "mmrcms"
 // include(":${lang}-${name}")