Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #5272 from element-hq/feature/bma/iterateOnBuildChain

Browse source 
Iterate on build chain
This commit is contained in:
Benoit Marty 2025-09-04 14:17:17 +02:00 • committed by GitHub
commit 25da1cba83
7 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle.kts
View file

@ -103,7 +103,8 @@ android {
} }
val baseAppName = BuildTimeConfig.APPLICATION_NAME val baseAppName = BuildTimeConfig.APPLICATION_NAME
logger.warnInBox("Building ${defaultConfig.applicationId} ($baseAppName)") val buildType = if (isEnterpriseBuild) "Enterprise" else "FOSS"
logger.warnInBox("Building ${defaultConfig.applicationId} ($baseAppName) [$buildType]")
buildTypes { buildTypes {
val oidcRedirectSchemeBase = BuildTimeConfig.METADATA_HOST_REVERSED ?: "io.element.android" val oidcRedirectSchemeBase = BuildTimeConfig.METADATA_HOST_REVERSED ?: "io.element.android"
@ -260,6 +261,7 @@ dependencies {
allEnterpriseImpl(project) allEnterpriseImpl(project)
implementation(projects.appicon.enterprise) implementation(projects.appicon.enterprise)
} else { } else {
implementation(projects.features.enterprise.implFoss)
implementation(projects.appicon.element) implementation(projects.appicon.element)
} }
allFeaturesImpl(project) allFeaturesImpl(project)

2
enterprise

@ -1 +1 @@
Subproject commit 76e10f6fa4db4196df245a3d29131a95d9e60a4d Subproject commit 9c78fd98e895ca8bf92ffc6604111155c8759cc0

0
features/enterprise/impl/build.gradle.kts → features/enterprise/impl-foss/build.gradle.kts
View file

0
features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt → features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt
View file

0
features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt → features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt
View file

0
features/enterprise/impl/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt → features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt
View file

0
features/enterprise/impl/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt → features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt
View file