Merge pull request #60 from omer358/dev

resolves #59
omer358 · Aug 23, 2024 · 0e12db5 · 0e12db5
2 parents e705805 + e17a0b5
commit 0e12db5
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/.github/workflows/build_and_deploy_apk.yml b/.github/workflows/build_and_deploy_apk.yml
@@ -18,6 +18,21 @@ jobs:
           distribution: 'zulu'
           cache: gradle
 
+      - name: Set environment variables
+        run: |
+          echo "export REMEMBER_ME_KEY_PASSWORD=${{ secrets.REMEMBER_ME_KEY_PASSWORD }}" >> $GITHUB_ENV
+          echo "export REMEMBER_ME_KEYSTORE_PASSWORD=${{ secrets.E_COMMERCE_KEY_STORE_PASSWORD }}" >> $GITHUB_ENV
+
+      - name: Decrypt Keystore File
+        env:
+          RELEASE_KEYSTORE_PHRASE: ${{ secrets.REMEMBER_RELEASE_KEYSTORE }}
+          RELEASE_KEYSTORE_FILE: ${{ secrets.KEYSTORE_FILE }}
+        run: |
+          mkdir keys
+          echo "$REMEMBER_RELEASE_KEYSTORE" > keys/keystore.jks.asc
+          echo "$RELEASE_KEYSTORE_PHRASE" > keystore_passphrase.txt
+          gpg -d --passphrase-file=keystore_passphrase.txt --batch keys/keystore.jks.asc > keys/keystore.jks
+
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -30,7 +30,8 @@ bin/
 gen/
 out/
 #  Uncomment the following line in case you need and you don't have the release build type files in your app
-# release/
+app/release/
+app/release/baselineProfiles/
 
 # Gradle files
 .gradle/
@@ -67,8 +68,9 @@ captures/
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
-#*.jks
-#*.keystore
+*.jks
+*.keystore
+/keys/
 
 # External native build folder generated in Android Studio 2.2 and later
 .cxx/

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,6 +10,15 @@ plugins {
 }
 
 android {
+    signingConfigs {
+
+        create("release") {
+            storeFile = file("$projectDir/keys/keystore.jks")
+            storePassword = System.getenv("REMEMBER_ME_KEYSTORE_PASSWORD")
+            keyAlias = System.getenv("REMEMBER_ME_KEYSTORE_ALIAS")
+            keyPassword = System.getenv("REMEMBER_ME_KEY_PASSWORD")
+        }
+    }
     namespace = "com.example.rememberme"
     compileSdk = 34
 
@@ -35,10 +44,14 @@ android {
                 "proguard-rules.pro"
             )
             isDebuggable = false
+            multiDexEnabled = true
+            signingConfig = signingConfigs.getByName("release")
         }
         debug {
             isMinifyEnabled = false
             isDebuggable = true
+            multiDexEnabled = true
+            signingConfig = signingConfigs.getByName("debug")
         }
     }
     compileOptions {