Merge pull request #145 from ELTEGANI/beta

Beta

Author: ELTEGANI

.github/workflows/releaseBeta.yml

@@ -1,8 +1,11 @@
 name: Release (Beta Version)
 
 on:
-  pull_request:
-    branches: [ beta ]
+  push:
+    paths:
+      - 'app/**'
+    branches:
+      -  beta
 
 jobs:
   deploy:
@@ -22,7 +25,6 @@ jobs:
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-gems-
-
       - name: Cache Gradle
         uses: actions/cache@v1
         with:
@@ -42,7 +44,6 @@ jobs:
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
-
       - name: Configure Keystore
         run: |
           echo "$ANDROID_KEYSTORE_FILE" > keystore.jks.b64
@@ -52,8 +53,8 @@ jobs:
           echo "storePassword=$KEYSTORE_STORE_PASSWORD" >> keystore.properties
           echo "keyPassword=$KEYSTORE_KEY_PASSWORD" >> keystore.properties
         env:
-          BUILD_KEY_STORE: ${{ secrets.BUILD_KEY_STORE }}
-          ANDROID_KEY_STORE_ALIAS: ${{ secrets.ANDROID_KEY_STORE_ALIAS }}
+          ANDROID_KEYSTORE_FILE: ${{ secrets.ANDROID_KEYSTORE_FILE }}
+          KEYSTORE_KEY_ALIAS: ${{ secrets.KEYSTORE_KEY_ALIAS }}
           KEYSTORE_KEY_PASSWORD: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
           KEYSTORE_STORE_PASSWORD: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
 
@@ -65,4 +66,4 @@ jobs:
           PLAY_CONFIG_JSON: ${{ secrets.PLAY_CONFIG_JSON }}
 
       - name: Distribute app to Beta track 🚀
-        run: bundle exec fastlane beta
+        run: bundle exec fastlane beta

Gemfile.lock

@@ -29,7 +29,7 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }

app/build.gradle

@@ -23,6 +23,7 @@ class GetUserCurrencyFragment : Fragment() {
 
     private lateinit var getUserCurrencyFragmentBinding : GetUserCurrencyFragmentBinding
     private val getUserCurrencyUserViewModel:GetUserCurrencyUserViewModel by viewModels()
+
     @Inject
     lateinit var expenseMonitorSharedPreferences:ExpenseMonitorSharedPreferences
 
@@ -45,6 +46,7 @@ class GetUserCurrencyFragment : Fragment() {
         getUserCurrencyFragmentBinding.nextButton.setOnClickListener {
             getUserCurrencyUserViewModel.saveUserCurrency()
         }
+
         return getUserCurrencyFragmentBinding.root
     }
 

app/src/main/java/com/monitoryourexpenses/expenses/usercurrency/GetUserCurrencyFragment.kt

@@ -91,4 +91,5 @@ class GetUserCurrencyUserViewModel @ViewModelInject
             localRepository.insertNewCategory(listOfCategories)
         }
     }
+
 }

app/src/main/java/com/monitoryourexpenses/expenses/usercurrency/GetUserCurrencyUserViewModel.kt

@@ -49,8 +49,8 @@ buildscript {
         classpath "com.android.tools.build:gradle:${buildGradle}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$gradlePlugin"
-        classpath("org.jlleitschuh.gradle:ktlint-gradle:9.2.1")
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.28.3-alpha'
+        classpath("org.jlleitschuh.gradle:ktlint-gradle:9.3.0")
+        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.29.1-alpha'
     }
 }
 

build.gradle

@@ -1,2 +1,3 @@
-json_key_file("/home/etegani/Downloads/play_config.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
-package_name("com.monitoryourexpenses.expenses") # e.g. com.krausefx.app
+json_key_file("play_config.json")
+
+package_name("com.monitoryourexpenses.expenses")