Merge branch 'release/v466'

uport-project · Jun 7, 2019 · 002a769 · 002a769
2 parents 3d0426a + 506ef0b
commit 002a769
Show file tree

Hide file tree

Showing 21 changed files with 7,033 additions and 520 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,70 +1,87 @@
 version: 2
 jobs:
-  node:
+  node-dependencies:
     working_directory: ~/uport-mobile
     docker:
       - image: circleci/node:8
     steps:
       - checkout
       - restore_cache:
           keys:
-            - yarn-{{ arch }}-v2-{{ checksum "yarn.lock" }}
-            - yarn-{{ arch }}-v2
-      - restore_cache:
-          keys:
-            - node-{{ arch }}-v2-{{ checksum "package.json" }}
-            - node-{{ arch }}-v2
-
+            - yarn-{{ arch }}-v5-{{ checksum "yarn.lock" }}
+            - yarn-{{ arch }}-v5
       - run:
           name: install-dependencies
-          command: |
-            sudo npm i -g  codecov node-gyp
-            yarn
-
+          command: yarn
       - save_cache:
-          key: yarn-{{ arch }}-v2-{{ checksum "yarn.lock" }}
+          key: yarn-{{ arch }}-v5-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn
-      - save_cache:
-          key: node-{{ arch }}-v2-{{ checksum "package.json" }}
+      - persist_to_workspace:
+          root: ~/uport-mobile
           paths:
             - node_modules
+
+  node-test:
+    working_directory: ~/uport-mobile
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/uport-mobile
+      - restore_cache:
+          keys:
+            - yarn-{{ arch }}-v5-{{ checksum "yarn.lock" }}
+            - yarn-{{ arch }}-v5
+      - run:
+          name: install tools
+          command: sudo npm i -g  codecov node-gyp
       - run:
           name: jest tests
           command: |
             mkdir -p test-results/jest
             yarn run test --ci --coverage --maxWorkers=3 && codecov
           environment:
             JEST_JUNIT_OUTPUT: test-results/jest/junit.xml
-
       - run:
           name: code-coverage
           command: bash <(curl -s https://codecov.io/bash)
 
+      - store_test_results:
+          path: test-results
+      - store_artifacts:
+          path: test-results
+
+  package-android-bundle:
+    working_directory: ~/uport-mobile
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/uport-mobile
+      - restore_cache:
+          keys:
+            - yarn-{{ arch }}-v5-{{ checksum "yarn.lock" }}
+            - yarn-{{ arch }}-v5
       - run:
           name: package react native android bundle independently
           command: yarn package-android --max-workers=3
-
       - persist_to_workspace:
           root: ~/uport-mobile
           paths:
             - node_modules
             - android/app/build/jsbundle/assets
             - android/app/build/jsbundle/res
 
-      - store_test_results:
-          path: test-results
-      - store_artifacts:
-          path: test-results
-
-  android:
+  android-dependencies:
     working_directory: ~/uport-mobile/android
     docker:
       - image: circleci/android:api-28-node8-alpha
         environment:
           YARN_VERSION: 1.2.1
           ANDROID_HOME: /opt/android/sdk
-          GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xms256m -Xmx3072m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=true -Dorg.gradle.parallel=true'
           TERM: dumb
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
@@ -74,39 +91,62 @@ jobs:
       - attach_workspace:
           at: ~/uport-mobile
 
-      - restore_cache:
-          keys:
-            - bundle-{{ arch }}-v8-{{ checksum "Gemfile.lock" }}
-            - bundle-{{ arch }}-v8
-      - run: bundle install
       - run: wget https://releases.hashicorp.com/vault/0.10.1/vault_0.10.1_linux_amd64.zip -O ~/vault.zip
-      - run: unzip ~/vault.zip -d ~/vault/
+      - run: mkdir -p ./tools/vault/ && unzip ~/vault.zip -d ./tools/vault/
 
-      - save_cache:
-          key: bundle-{{ arch }}-v8-{{ checksum "Gemfile.lock" }}
-          paths:
-            - vendor/bundle
-            - .bundle
-            - ~/.bundle
       - restore_cache:
           keys:
             - android-{{ arch }}-v4-{{ checksum "build.gradle" }}
             - android-{{ arch }}-v4
+      - run:
+          name: ensure daemon is fresh
+          command: ./gradlew --stop
       - run:
           name: get android dependencies
-          command: ./gradlew :app:dependencies androidDependencies --no-parallel --no-daemon
+          command: ./gradlew :app:dependencies androidDependencies
       - save_cache:
           key: android-{{ arch }}-v4-{{ checksum "build.gradle" }}
           paths:
             - .gradle
             - ~/.gradle
 
-      - run: PATH=$PATH:$HOME/vault && bash ../scripts/pull_google_services.sh
-      - run: ./gradlew :app:deliverArchives -x bundleReleaseJsAndAssets --no-parallel --no-daemon
+      - persist_to_workspace:
+          root: ~/uport-mobile
+          paths:
+            - android/tools/vault
+
+  android:
+    working_directory: ~/uport-mobile/android
+    docker:
+      - image: circleci/android:api-28-node8-alpha
+        environment:
+          YARN_VERSION: 1.2.1
+          ANDROID_HOME: /opt/android/sdk
+          TERM: dumb
+          LC_ALL: en_US.UTF-8
+          LANG: en_US.UTF-8
+    steps:
+      - checkout:
+          path: ~/uport-mobile
+      - attach_workspace:
+          at: ~/uport-mobile
 
+      - restore_cache:
+          keys:
+            - android-{{ arch }}-v4-{{ checksum "build.gradle" }}
+            - android-{{ arch }}-v4
+      - run:
+          name: ensure daemon is fresh
+          command: ./gradlew --stop
+      - run:
+          name: get google services json
+          command: PATH="$PATH:$(pwd)/tools/vault" && bash ../scripts/pull_google_services.sh
+      - run:
+          name: build the release APK
+          command: ./gradlew :app:deliverArchives -x bundleReleaseJsAndAssets --no-parallel --max-workers 1
       - run:
           name: tests
-          command: cd ~/uport-mobile/android && ./gradlew :app:lint :app:test -x bundleReleaseJsAndAssets --no-parallel --no-daemon
+          command: ./gradlew :app:lint :app:test -x bundleReleaseJsAndAssets --no-parallel --max-workers 1
 
       - persist_to_workspace:
           root: ~/uport-mobile
@@ -187,10 +227,15 @@ jobs:
             - bundle-{{ arch }}-v8-{{ checksum "Gemfile.lock" }}
             - bundle-{{ arch }}-v8
       - run: bundle install
-      - run: wget https://releases.hashicorp.com/vault/0.10.1/vault_0.10.1_linux_amd64.zip -O ~/vault.zip
-      - run: unzip ~/vault.zip -d ~/vault/
+      - save_cache:
+          key: bundle-{{ arch }}-v8-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+            - .bundle
+            - ~/.bundle
+
+      - run: PATH="$PATH:$(pwd)/tools/vault" && bash ../scripts/pull_service_key.sh && fastlane android internal; rm -f ../google-play-key-file.json
 
-      - run: PATH=$PATH:$HOME/vault && bash ../scripts/pull_service_key.sh && fastlane android internal; rm -f ../google-play-key-file.json
   deploy-ios:
     working_directory: ~/uport-mobile
     environment:
@@ -222,14 +267,33 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - node:
+      - node-dependencies:
           filters:
             tags:
               only: /.*/
-      - android:
+      - node-test:
+          requires:
+            - node-dependencies
+          filters:
+            tags:
+              only: /.*/
+      - package-android-bundle:
+          requires:
+            - node-dependencies
+          filters:
+            tags:
+              only: /.*/
+      - android-dependencies:
           requires:
             - vault
-            - node
+            - node-dependencies
+          filters:
+            tags:
+              only: /.*/
+      - android:
+          requires:
+            - android-dependencies
+            - package-android-bundle
           filters:
             tags:
               only: /.*/

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
-.idea/
+**/.idea/
+**/tools/vault/
+
 # Created by https://www.gitignore.io/api/linux,xcode,macos,android,windows,reactnative,androidstudio
 
 ### Android ###

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## [v466](https://github.com/uport-project/uport-mobile/tree/v466) (2019-06-07)
+[Full Changelog](https://github.com/uport-project/uport-mobile/compare/v465...v466)
+
+**Merged pull requests:**
+
+- Check if any events are available and not just a 200 status [\#159](https://github.com/uport-project/uport-mobile/pull/159) ([pelle](https://github.com/pelle))
+- Fix transaction card and gas calculations [\#158](https://github.com/uport-project/uport-mobile/pull/158) ([pelle](https://github.com/pelle))
+- \[Support\] limit ci memory usage [\#157](https://github.com/uport-project/uport-mobile/pull/157) ([mirceanis](https://github.com/mirceanis))
+
 ## [v465](https://github.com/uport-project/uport-mobile/tree/v465) (2019-05-30)
 [Full Changelog](https://github.com/uport-project/uport-mobile/compare/v464...v465)
 

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -28,7 +28,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
diff --git a/android/version.properties b/android/version.properties
@@ -1,5 +1,5 @@
 #This is a generated file so things tend to get overwritten.
 #Use `gradlew bumpVersion` to increment the version by 1
 #or `gradlew bumpVersion -P_BUILD_NUMBER=<your specific version>` to set it manually
-#Thu May 30 10:28:24 EEST 2019
-BUILD_NUMBER=465
+#Fri Jun 07 16:11:28 EEST 2019
+BUILD_NUMBER=466
diff --git a/ios/uPortMobile.xcodeproj/project.pbxproj b/ios/uPortMobile.xcodeproj/project.pbxproj
@@ -2403,7 +2403,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				COPY_HEADERS_RUN_UNIFDEF = NO;
-				CURRENT_PROJECT_VERSION = 465;
+				CURRENT_PROJECT_VERSION = 466;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 82SAVLYZ3K;
 				ENABLE_BITCODE = NO;
@@ -2472,7 +2472,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_HEADERS_RUN_UNIFDEF = NO;
-				CURRENT_PROJECT_VERSION = 465;
+				CURRENT_PROJECT_VERSION = 466;
 				DEVELOPMENT_TEAM = 82SAVLYZ3K;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/ios/uPortMobile/Info.plist b/ios/uPortMobile/Info.plist
@@ -52,7 +52,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>465</string>
+	<string>466</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/ios/uPortMobileTests/Info.plist b/ios/uPortMobileTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>465</string>
+	<string>466</string>
 </dict>
 </plist>
diff --git a/lib/components/Request/types/__tests__/__snapshots__/ConnectionCard-test.js.snap b/lib/components/Request/types/__tests__/__snapshots__/ConnectionCard-test.js.snap
@@ -1523,9 +1523,16 @@ exports[`ConnectionCard renders correctly with a complete profile 1`] = `
               "fontSize": 18,
               "textAlign": "center",
             },
-            Object {
-              "color": "#FFFFFF",
-            },
+            Array [
+              Object {
+                "fontFamily": "Montserrat",
+                "fontSize": 18,
+                "textAlign": "center",
+              },
+              Object {
+                "color": "#FFFFFF",
+              },
+            ],
             Object {},
           ]
         }
@@ -2207,9 +2214,16 @@ exports[`ConnectionCard renders correctly with an unkown contact 1`] = `
               "fontSize": 18,
               "textAlign": "center",
             },
-            Object {
-              "color": "#FFFFFF",
-            },
+            Array [
+              Object {
+                "fontFamily": "Montserrat",
+                "fontSize": 18,
+                "textAlign": "center",
+              },
+              Object {
+                "color": "#FFFFFF",
+              },
+            ],
             Object {},
           ]
         }