Merge branch 'develop' into try/using-lib-in-video-compression-scenario

.circleci/config.yml

@@ -4,7 +4,6 @@ orbs:
   # Using 1.0 of the Orbs means it will use the latest 1.0.x version from https://github.com/wordpress-mobile/circleci-orbs
   android: wordpress-mobile/[email protected]
   git: wordpress-mobile/[email protected]
-  bundle-install: toshimaru/[email protected]
   slack: circleci/[email protected]
 
 commands:
@@ -16,7 +15,7 @@ commands:
 
 jobs:
   Lint:
-    executor: 
+    executor:
       name: android/default
       api-version: "29"
     steps:
@@ -36,7 +35,7 @@ jobs:
       - android/save-gradle-cache
       - android/save-lint-results
   Unit Tests:
-    executor: 
+    executor:
       name: android/default
       api-version: "29"
     steps:
@@ -48,44 +47,42 @@ jobs:
           command: ./gradlew --stacktrace -PtestsMaxHeapSize=1536m testRelease
       - android/save-gradle-cache
       - android/save-test-results
-  Installable Build:
-    executor: 
-      name: android/default
-      api-version: "29"
-    steps:
-      - checkout
-      - bundle-install/bundle-install:
-          cache_key_prefix: installable-build
-      - run:
-          name: Copy Secrets
-          command: bundle exec fastlane run configure_apply
-      - android/restore-gradle-cache
-      - run:
-          name: Build APK
-          command: |
-            if [ -n "$CIRCLE_PULL_REQUEST" ]; then
-              PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST)
-              PREFIX="pr-${PR_NUMBER}"
-            else
-              PREFIX="$CIRCLE_BRANCH"
-            fi
-            VERSION_NAME="${PREFIX}-build-${CIRCLE_BUILD_NUM}"
-            echo "export VERSION_NAME=$VERSION_NAME" >> $BASH_ENV
-
-            ./gradlew --stacktrace app:assembleRelease -PversionName="$VERSION_NAME"
-      - android/save-gradle-cache
-      - run:
-          name: Prepare APK
-          command: |
-            mkdir -p Artifacts
-            mv app/build/outputs/apk/release/app-release.apk "Artifacts/Loop-${VERSION_NAME}.apk"
-      - store_artifacts:
-          path: Artifacts
-          destination: Artifacts
+#  Installable Build:
+#    executor:
+#      name: android/default
+#      api-version: "29"
+#    steps:
+#      - checkout
+#      - run:
+#          name: Apply Configuration
+#          command: ./gradlew applyConfiguration
+#      - android/restore-gradle-cache
+#      - run:
+#          name: Build APK
+#          command: |
+#            if [ -n "$CIRCLE_PULL_REQUEST" ]; then
+#              PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST)
+#              PREFIX="pr-${PR_NUMBER}"
+#            else
+#              PREFIX="$CIRCLE_BRANCH"
+#            fi
+#            VERSION_NAME="${PREFIX}-build-${CIRCLE_BUILD_NUM}"
+#            echo "export VERSION_NAME=$VERSION_NAME" >> $BASH_ENV
+#
+#            ./gradlew --stacktrace app:assembleRelease -PversionName="$VERSION_NAME"
+#      - android/save-gradle-cache
+#      - run:
+#          name: Prepare APK
+#          command: |
+#            mkdir -p Artifacts
+#            mv app/build/outputs/apk/release/app-release.apk "Artifacts/Loop-${VERSION_NAME}.apk"
+#      - store_artifacts:
+#          path: Artifacts
+#          destination: Artifacts
 
 workflows:
   loop:
     jobs:
       - Lint
       - Unit Tests
-      - Installable Build
+#      - Installable Build

.configure

@@ -1,7 +1,7 @@
 {
   "project_name": "stories-android",
   "branch": "master",
-  "pinned_hash": "746c07fd89399e5951493a32f2e853e804ca7fca",
+  "pinned_hash": "c8d5a863639968f824f2fb2a7e3e7616c828d521",
   "files_to_copy": [
     {
       "file": "android/Loop/gradle.properties",
@@ -10,7 +10,7 @@
     },
     {
       "file": "android/automattic.jks",
-      "destination": "app/release.jks",
+      "destination": ".configure-files/release.jks",
       "encrypt": true
     }
   ],

.gitignore

@@ -24,6 +24,13 @@ gradle.properties
 # Local configuration file (sdk path, etc)
 local.properties
 
+# Configuration Secrets
+.configure-files/*
+!.configure-files/*.enc
+
+# Ignore auto-created gradle.properties backups from `./gradlew updateConfiguration`
+gradle*.properties.bak
+
 # Proguard folder generated by Eclipse
 proguard/