fix: sourceSets dir fallback

openedx · Jun 7, 2024 · 3980a15 · 3980a15
1 parent 1bc1d4c
commit 3980a15
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,6 @@
 def config = configHelper.fetchConfig()
 def appId = config.getOrDefault("APPLICATION_ID", "org.openedx.app")
-def platformName = config.getOrDefault("PLATFORM_NAME", "OpenEdx").toLowerCase()
+def themeDirectory = config.getOrDefault("THEME_DIRECTORY", "openedx")
 def firebaseConfig = config.get('FIREBASE')
 def firebaseEnabled = firebaseConfig?.getOrDefault('ENABLED', false)
 
@@ -63,13 +63,13 @@ android {
 
     sourceSets {
         prod {
-            res.srcDirs = ["src/$platformName/res"]
+            res.srcDirs = ["src/$themeDirectory/res"]
         }
         develop {
-            res.srcDirs = ["src/$platformName/res"]
+            res.srcDirs = ["src/$themeDirectory/res"]
         }
         stage {
-            res.srcDirs = ["src/$platformName/res"]
+            res.srcDirs = ["src/$themeDirectory/res"]
         }
     }
 

diff --git a/core/build.gradle b/core/build.gradle
@@ -17,7 +17,7 @@ plugins {
 
 def currentFlavour = getCurrentFlavor()
 def config = configHelper.fetchConfig()
-def platformName = config.getOrDefault("PLATFORM_NAME", "OpenEdx").toLowerCase()
+def themeDirectory = config.getOrDefault("THEME_DIRECTORY", "openedx")
 
 android {
     compileSdk 34
@@ -50,16 +50,16 @@ android {
 
     sourceSets {
         prod {
-            java.srcDirs = ["src/$platformName"]
-            res.srcDirs = ["src/$platformName/res"]
+            java.srcDirs = ["src/$themeDirectory"]
+            res.srcDirs = ["src/$themeDirectory/res"]
         }
         develop {
-            java.srcDirs = ["src/$platformName"]
-            res.srcDirs = ["src/$platformName/res"]
+            java.srcDirs = ["src/$themeDirectory"]
+            res.srcDirs = ["src/$themeDirectory/res"]
         }
         stage {
-            java.srcDirs = ["src/$platformName"]
-            res.srcDirs = ["src/$platformName/res"]
+            java.srcDirs = ["src/$themeDirectory"]
+            res.srcDirs = ["src/$themeDirectory/res"]
         }
         main {
             assets {

diff --git a/default_config/dev/config.yaml b/default_config/dev/config.yaml
@@ -72,6 +72,8 @@ BRANCH:
 #Platform names
 PLATFORM_NAME: "OpenEdX"
 PLATFORM_FULL_NAME: "OpenEdX"
+#App sourceSets dir
+THEME_DIRECTORY: "openedx"
 #tokenType enum accepts JWT and BEARER only
 TOKEN_TYPE: "JWT"
 #feature flag for activating What’s New feature

diff --git a/default_config/prod/config.yaml b/default_config/prod/config.yaml
@@ -72,6 +72,8 @@ BRANCH:
 #Platform names
 PLATFORM_NAME: "OpenEdX"
 PLATFORM_FULL_NAME: "OpenEdX"
+#App sourceSets dir
+THEME_DIRECTORY: "openedx"
 #tokenType enum accepts JWT and BEARER only
 TOKEN_TYPE: "JWT"
 #feature flag for activating What’s New feature

diff --git a/default_config/stage/config.yaml b/default_config/stage/config.yaml
@@ -72,6 +72,8 @@ BRANCH:
 #Platform names
 PLATFORM_NAME: "OpenEdX"
 PLATFORM_FULL_NAME: "OpenEdX"
+#App sourceSets dir
+THEME_DIRECTORY: "openedx"
 #tokenType enum accepts JWT and BEARER only
 TOKEN_TYPE: "JWT"
 #feature flag for activating What’s New feature