Skip to content

Backport of sourceSets dir fallback (#335) #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
volodymyr-chekyrta merged 1 commit into from
Jun 10, 2024
Merged

Backport of sourceSets dir fallback (#335) #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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"]
}
}

Expand Down
14 changes: 7 additions & 7 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions default_config/dev/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,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
Expand Down
2 changes: 2 additions & 0 deletions default_config/prod/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,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
Expand Down
2 changes: 2 additions & 0 deletions default_config/stage/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,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
Expand Down