🚀[Release v2.13.0] Merge into Main

.circleci/config.yml

@@ -2,25 +2,51 @@
 # See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 
+orbs:
+  android: circleci/[email protected]
+
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
-  say-hello:
-    # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
-    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
-    docker:
-      - image: cimg/base:stable
-    # Add steps to the job
-    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+  unit-test:
+    executor:
+      name: android/android_machine
+      resource_class: large
+      tag: default
     steps:
       - checkout
       - run:
           name: "Say hello"
-          command: "echo Hello, World!"
+          command: "echo Hello, World! && ls"
+      - run:
+          name: "Default for gradle.properties"
+          command: "echo \"RELEASE_STORE_FILE=/\nRELEASE_STORE_PASSWORD=\nRELEASE_KEY_ALIAS=\nRELEASE_KEY_PASSWORD=\nandroid.useAndroidX=true\nandroid.enableJetifier=true\" >> gradle.properties && ls && cat gradle.properties"
+      - run:
+          name: "Initialize submodule"
+          command: "git submodule init && git submodule update --init --recursive"
+      - run:
+          name: "Copy google-services.json"
+          command: echo "$GOOGLE_SERVICES_JSON" | base64 --decode > app/google-services.json
+      - android/restore_gradle_cache
+      - run:
+          name: "Execute Unit Test"
+          command: ./gradlew testLitewalletDebugUnitTest
+      - android/save_gradle_cache
+      - run:
+          name: Save test results
+          command: |
+            mkdir -p ~/test-results/junit/
+            find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
+          when: always
+      - store_test_results:
+          path: ~/test-results
+      - store_artifacts:
+          path: ~/test-results/junit
+
 
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
 workflows:
-  say-hello-workflow:
+  test-and-build:
     jobs:
-      - say-hello
+      - unit-test

.gitignore

@@ -103,3 +103,5 @@ app/src/litewalletDebug/google-services.json
 /.idea/dictionaries/grunt.xml
 androidTestResultsUserPreferences.xml
 .idea/deploymentTargetSelector.xml
+.idea/inspectionProfiles/Project_Default.xml
+app/.idea/gradle.xml

app/build.gradle

@@ -31,29 +31,30 @@ android {
         }
     }
     assetPacks = [":install_time_asset_pack",":fast_follow_asset_pack_01"]
-    signingConfigs {
-        release {
-            storeFile file(RELEASE_STORE_FILE)
-            storePassword RELEASE_STORE_PASSWORD
-            keyAlias RELEASE_KEY_ALIAS
-            keyPassword RELEASE_KEY_PASSWORD
-        }
-    }
-
-    Properties props = new Properties()
-    def propFile = file('../release.properties')
-    if (propFile.canRead()) {
-        props.load(new FileInputStream(propFile))
 
-        if (props != null && props.containsKey('storeFile') && props.containsKey('storePassword') &&
-                props.containsKey('keyAlias') && props.containsKey('keyPassword')) {
-
-            android.signingConfigs.release.storeFile = file(props['storeFile'])
-            android.signingConfigs.release.storePassword = props['storePassword']
-            android.signingConfigs.release.keyAlias = props['keyAlias']
-            android.signingConfigs.release.keyPassword = props['keyPassword']
-        }
-    }
+   signingConfigs {
+       release {
+           storeFile file(RELEASE_STORE_FILE)
+           storePassword RELEASE_STORE_PASSWORD
+           keyAlias RELEASE_KEY_ALIAS
+           keyPassword RELEASE_KEY_PASSWORD
+       }
+   }
+
+   Properties props = new Properties()
+   def propFile = file('../release.properties')
+   if (propFile.canRead()) {
+       props.load(new FileInputStream(propFile))
+
+       if (props != null && props.containsKey('storeFile') && props.containsKey('storePassword') &&
+               props.containsKey('keyAlias') && props.containsKey('keyPassword')) {
+
+           android.signingConfigs.release.storeFile = file(props['storeFile'])
+           android.signingConfigs.release.storePassword = props['storePassword']
+           android.signingConfigs.release.keyAlias = props['keyAlias']
+           android.signingConfigs.release.keyPassword = props['keyPassword']
+       }
+   }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -68,8 +69,8 @@ android {
         applicationId = 'com.loafwallet'
         minSdkVersion 29
         targetSdkVersion 34
-        versionCode 20241130
-        versionName "v2.12.4"
+        versionCode 20241212
+        versionName "v2.13.0"
         multiDexEnabled true
         archivesBaseName = "${versionName}(${versionCode})"
 
@@ -276,6 +277,7 @@ dependencies {
     implementation 'org.json:json:20231013'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
     implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+    implementation 'androidx.test.ext:junit-ktx:1.2.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'junit:junit:4.12'
     androidTestImplementation('androidx.test.espresso:espresso-core:3.5.1')
@@ -322,6 +324,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-crashlytics-ndk'
     implementation('com.google.firebase:firebase-iid:21.1.0')
+    implementation("com.google.firebase:firebase-config-ktx")
 
     // push notifications
     implementation 'com.google.firebase:firebase-messaging:23.4.0'