Merge pull request #111 from niscy-eudiw/main

Minor refactor with more generic Names for Build Configuration Files
eu-digital-identity-wallet · May 30, 2024 · 05d7ac6 · 05d7ac6
2 parents 8944716 + aab39a4
commit 05d7ac6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,7 +14,7 @@
  * governing permissions and limitations under the Licence.
  */
 
-import eu.europa.ec.euidi.EudiBuildType
+import eu.europa.ec.euidi.AppBuildType
 import eu.europa.ec.euidi.config.LibraryModule
 import eu.europa.ec.euidi.getProperty
 
@@ -53,12 +53,12 @@ android {
         debug {
             isDebuggable = true
             isMinifyEnabled = false
-            applicationIdSuffix = EudiBuildType.DEBUG.applicationIdSuffix
+            applicationIdSuffix = AppBuildType.DEBUG.applicationIdSuffix
         }
         release {
             isDebuggable = false
             isMinifyEnabled = false
-            applicationIdSuffix = EudiBuildType.RELEASE.applicationIdSuffix
+            applicationIdSuffix = AppBuildType.RELEASE.applicationIdSuffix
             signingConfig = signingConfigs.getByName("release")
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }

diff --git a/...otlin/eu/europa/ec/euidi/EudiBuildType.kt → ...kotlin/eu/europa/ec/euidi/AppBuildType.kt b/...otlin/eu/europa/ec/euidi/EudiBuildType.kt → ...kotlin/eu/europa/ec/euidi/AppBuildType.kt
@@ -19,7 +19,7 @@ package eu.europa.ec.euidi
 /**
  * This is shared between :app and modules to provide configurations type safety.
  */
-enum class EudiBuildType(val applicationIdSuffix: String? = null) {
+enum class AppBuildType(val applicationIdSuffix: String? = null) {
     DEBUG,
     RELEASE
 }
diff --git a/...n/kotlin/eu/europa/ec/euidi/EudiFlavor.kt → ...in/kotlin/eu/europa/ec/euidi/AppFlavor.kt b/...n/kotlin/eu/europa/ec/euidi/EudiFlavor.kt → ...in/kotlin/eu/europa/ec/euidi/AppFlavor.kt
@@ -26,7 +26,7 @@ enum class FlavorDimension {
     contentType
 }
 
-enum class EudiFlavor(
+enum class AppFlavor(
     val dimension: FlavorDimension,
     val applicationIdSuffix: String? = null,
     val applicationNameSuffix: String? = null
@@ -38,12 +38,12 @@ enum class EudiFlavor(
 fun configureFlavors(
     commonExtension: CommonExtension<*, *, *, *, *, *>,
     version: String,
-    flavorConfigurationBlock: ProductFlavor.(flavor: EudiFlavor) -> Unit = {}
+    flavorConfigurationBlock: ProductFlavor.(flavor: AppFlavor) -> Unit = {}
 ) {
     commonExtension.apply {
         flavorDimensions += FlavorDimension.contentType.name
         productFlavors {
-            EudiFlavor.values().forEach {
+            AppFlavor.values().forEach {
                 create(it.name.lowercase()) {
                     val fullVersion = "$version-${it.name}"
                     dimension = it.dimension.name