🚀[Release v2.14.0] Merge into Develop

.circleci/circle_env.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+function copyEnvironmentVariablesToGradleProperties {
+    DIR="$(pwd)"
+    GRADLE_PROPERTIES=${DIR}"/gradle.properties"
+    export GRADLE_PROPERTIES
+    echo "Gradle Properties should exist at $GRADLE_PROPERTIES"
+
+    if [[ ! -f "$GRADLE_PROPERTIES" ]]; then
+        echo "Gradle Properties does not exist"
+
+        echo "Creating Gradle Properties file..."
+        touch $GRADLE_PROPERTIES
+
+        echo "Writing keys to gradle.properties..."
+        echo "RELEASE_KEYSTORE_FILE=$RELEASE_KEYSTORE_FILE" >> ${GRADLE_PROPERTIES}
+        echo "RELEASE_KEYSTORE_PASSWORD=$RELEASE_KEYSTORE_PASSWORD" >> ${GRADLE_PROPERTIES}
+        echo "RELEASE_KEY_ALIAS=$RELEASE_KEY_ALIAS" >> ${GRADLE_PROPERTIES}
+        echo "RELEASE_KEY_PASSWORD=$RELEASE_KEY_PASSWORD" >> ${GRADLE_PROPERTIES}
+    fi
+}
+
+
+
+function fetchKeystore {
+    sudo gpg --passphrase ${RELEASE_KEYSTORE_ENCRYPTION_KEY} --pinentry-mode loopback -o "app/$RELEASE_KEYSTORE_FILE" -d  "upload-binary/$RELEASE_KEYSTORE_FILE.gpg"
+}

.circleci/config.yml

@@ -8,7 +8,7 @@ orbs:
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
-  unit-test:
+  all-unit-tests:
     executor:
       name: android/android_docker
       resource_class: large
@@ -18,12 +18,12 @@ jobs:
       - run:
           name: "litewallet-android unit test setup..."
           command: "echo Building tests for litewallet-android! && ls"
+      - run:
+          name: "Initialize submodules"
+          command: "git submodule init && git submodule update --init --recursive"
       - 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: "Export google-services.json to env"
           command: echo 'export $GOOGLE_SERVICES_JSON="$GOOGLE_SERVICES_JSON"' >> $BASH_ENV
@@ -32,7 +32,7 @@ jobs:
           command: echo "$GOOGLE_SERVICES_JSON" | base64 --decode > app/google-services.json
       - android/restore_gradle_cache
       - run:
-          name: "Execute Unit Test"
+          name: "Execute Unit Test" 
           command: ./gradlew testLitewalletDebugUnitTest
       - android/save_gradle_cache
       - run:
@@ -46,10 +46,9 @@ jobs:
       - store_artifacts:
           path: ~/test-results/junit
 
-
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
 workflows:
   test-and-build:
     jobs:
-      - unit-test
+      - all-unit-tests

.gitignore

@@ -104,3 +104,4 @@ app/src/litewalletDebug/google-services.json
 androidTestResultsUserPreferences.xml
 .idea/deploymentTargetSelector.xml
 .idea/inspectionProfiles/Project_Default.xml
+/app/upload-binary/*

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "app/src/main/jni/loafwallet-core"]
 	path = app/src/main/jni/loafwallet-core
 	url = https://github.com/litecoin-foundation/loafwallet-core.git
+[submodule "litewallet-data"]
+	path = litewallet-data
+	url = https://github.com/gruntsoftware/litewallet-data.git