Fix after merge. Now projects build and app sends to QA

CashAdv · Nov 29, 2023 · 5261305 · 5261305
1 parent 3a71b09
commit 5261305
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,7 +12,6 @@ plugins {
     alias(libs.plugins.firebase.crashlytics.gradle)
     alias(libs.plugins.gms.googleServices)
     alias(libs.plugins.firebase.appdistribution)
-
 }
 
 android {
@@ -28,7 +27,6 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
-
     signingConfigs {
         create("release") {
 
@@ -59,7 +57,6 @@ android {
 
         create("qa") {
             initWith(getByName("release"))
-            isMinifyEnabled = false
             applicationIdSuffix = ".qa"
             signingConfig = signingConfigs.getByName("release")
         }
@@ -69,14 +66,6 @@ android {
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
             )
-
-        }
-
-        firebaseAppDistribution{
-            artifactType = "APK"
-            releaseNotesFile = "app/src/stage/qa/releaseNotes.txt"
-            testers = "QA"
-
             signingConfig = signingConfigs.getByName("release")
         }
     }
@@ -107,12 +96,19 @@ android {
     }
 }
 
-task("appDistirbutionToQaStageQa") {
+firebaseAppDistribution {
+    artifactType = "APK"
+    releaseNotesFile = "app/src/releaseNotes.txt"
+    testers = "QA"
+    serviceCredentialsFile = "app/serviceCredentialsFile.json"
+}
+
+task("appDistributionToQaStageQa") {
     dependsOn("assembleStageQa")
     dependsOn("appDistributionUploadStageQa")
 }
 
-task("appDistirbutionToQaProdQa") {
+task("appDistributionToQaProdQa") {
     dependsOn("assembleProdQa")
     dependsOn("appDistributionUploadProdQa")
 }

diff --git a/app/src/stage/qa/releaseNotes.txt → app/src/releaseNotes.txt b/app/src/stage/qa/releaseNotes.txt → app/src/releaseNotes.txt
diff --git a/uikit/build.gradle.kts b/uikit/build.gradle.kts
@@ -15,14 +15,32 @@ android {
     }
 
     buildTypes {
-        release {
+        getByName("debug") {}
+
+        create("qa") {
+            initWith(getByName("release"))
+        }
+
+        getByName("release") {
             isMinifyEnabled = false
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
             )
         }
     }
+
+    flavorDimensions += "env"
+
+    productFlavors {
+        create("stage") {
+            dimension = "env"
+        }
+
+        create("prod") {
+            dimension = "env"
+        }
+    }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8