From 0927a502f59606e5bc7d6b7f8946fe15730c8f9e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 4 Sep 2025 13:33:37 +0200 Subject: [PATCH] Do not let default enterprise `impl` module be implemented for enterprise build. --- app/build.gradle.kts | 1 + features/enterprise/{impl => impl-foss}/build.gradle.kts | 0 .../android/features/enterprise/impl/DefaultEnterpriseService.kt | 0 .../features/enterprise/impl/DefaultSessionEnterpriseService.kt | 0 .../features/enterprise/impl/DefaultEnterpriseServiceTest.kt | 0 .../enterprise/impl/DefaultSessionEnterpriseServiceTest.kt | 0 6 files changed, 1 insertion(+) rename features/enterprise/{impl => impl-foss}/build.gradle.kts (100%) rename features/enterprise/{impl => impl-foss}/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt (100%) rename features/enterprise/{impl => impl-foss}/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt (100%) rename features/enterprise/{impl => impl-foss}/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt (100%) rename features/enterprise/{impl => impl-foss}/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt (100%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bc50437fb2..c8d07a80d7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -261,6 +261,7 @@ dependencies { allEnterpriseImpl(project) implementation(projects.appicon.enterprise) } else { + implementation(projects.features.enterprise.implFoss) implementation(projects.appicon.element) } allFeaturesImpl(project) diff --git a/features/enterprise/impl/build.gradle.kts b/features/enterprise/impl-foss/build.gradle.kts similarity index 100% rename from features/enterprise/impl/build.gradle.kts rename to features/enterprise/impl-foss/build.gradle.kts diff --git a/features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt similarity index 100% rename from features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt rename to features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt diff --git a/features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt similarity index 100% rename from features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt rename to features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt diff --git a/features/enterprise/impl/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt b/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt similarity index 100% rename from features/enterprise/impl/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt rename to features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt diff --git a/features/enterprise/impl/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt b/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt similarity index 100% rename from features/enterprise/impl/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt rename to features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt