Merge branch 'develop' into gutenberg/upgrade-RN-0-62

# Conflicts: # Podfile # Podfile.lock
wordpress-mobile · Apr 21, 2020 · 0e7d743 · 0e7d743
2 parents 9940de7 + 3e51da2
commit 0e7d743
Show file tree

Hide file tree

Showing 188 changed files with 2,453 additions and 854 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,19 +20,6 @@ commands:
               echo $PATH
             fi
 
-  save-xcresult:
-    steps:
-      - run:
-          name: Zip xcresult
-          command: |
-            mkdir testresults
-            zip -r testresults/xcresult.zip test-without-building.xcresult
-          when: on_fail # Zips the .xcresult file when tests fail, so it can be saved
-      - store_artifacts:
-          name: Save xcresult
-          path: testresults
-          destination: logs
-
 jobs:
   Build Tests:
     executor:
@@ -51,23 +38,29 @@ jobs:
           paths:
             - DerivedData/Build/Products
             - Pods/WordPressMocks
+            - vendor/bundle
   Unit Tests:
     executor:
       name: ios/default
       xcode-version: "11.2.1"
     steps:
       - fix-path
+      - git/shallow-checkout
       - ios/boot-simulator:
           xcode-version: "11.2.1"
           device: iPhone 11
       - attach_workspace:
           at: ./
+      - run:
+          name: Prepare Bundle
+          command: bundle --path vendor/bundle
       - ios/wait-for-simulator
-      - ios/xcodebuild:
-          command: test-without-building
-          arguments: -xctestrun DerivedData/Build/Products/WordPress_WordPressUnitTests_iphonesimulator13.2-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID" -resultBundlePath test-without-building.xcresult
-      - ios/save-xcodebuild-artifacts
-      - save-xcresult
+      - run:
+          name: Run Unit Tests
+          working_directory: Scripts
+          command: bundle exec fastlane test_without_building xctestrun:DerivedData/Build/Products/WordPress_WordPressUnitTests_iphonesimulator13.2-x86_64.xctestrun destination:"platform=iOS Simulator,id=$SIMULATOR_UDID" try_count:3
+      - ios/save-xcodebuild-artifacts:
+          result-bundle-path: build/results
   UI Tests:
     parameters:
       device:
@@ -81,21 +74,26 @@ jobs:
       xcode-version: "11.2.1"
     steps:
       - fix-path
+      - git/shallow-checkout
       - ios/boot-simulator:
           xcode-version: "11.2.1"
           device: << parameters.device >>
       - attach_workspace:
           at: ./
+      - run:
+          name: Prepare Bundle
+          command: bundle --path vendor/bundle
       - run:
           name: Run mocks
           command: ./Pods/WordPressMocks/scripts/start.sh 8282
           background: true
       - ios/wait-for-simulator
-      - ios/xcodebuild:
-          command: test-without-building
-          arguments: -xctestrun DerivedData/Build/Products/WordPress_WordPressUITests_iphonesimulator13.2-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID" -resultBundlePath test-without-building.xcresult
-      - ios/save-xcodebuild-artifacts
-      - save-xcresult
+      - run:
+          name: Run UI Tests
+          working_directory: Scripts
+          command: bundle exec fastlane test_without_building xctestrun:DerivedData/Build/Products/WordPress_WordPressUITests_iphonesimulator13.2-x86_64.xctestrun destination:"platform=iOS Simulator,id=$SIMULATOR_UDID" try_count:3
+      - ios/save-xcodebuild-artifacts:
+          result-bundle-path: build/results
       - when:
           condition: << parameters.post-to-slack >>
           steps:

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/wordpress-mobile/release-toolkit
-  revision: d00351ee4e04d8a5f3305116dab017b2c389b1cf
-  tag: 0.9.1
+  revision: e426345db3afc839ee463ec1ce8432f584880957
+  tag: 0.9.2
   specs:
-    fastlane-plugin-wpmreleasetoolkit (0.9.1)
+    fastlane-plugin-wpmreleasetoolkit (0.9.2)
       activesupport (~> 4)
       chroma (= 0.2.0)
       diffy (~> 3.3)
@@ -31,15 +31,15 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    aws-eventstream (1.0.3)
-    aws-sdk (2.11.463)
-      aws-sdk-resources (= 2.11.463)
-    aws-sdk-core (2.11.463)
+    aws-eventstream (1.1.0)
+    aws-sdk (2.11.490)
+      aws-sdk-resources (= 2.11.490)
+    aws-sdk-core (2.11.490)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.463)
-      aws-sdk-core (= 2.11.463)
-    aws-sigv4 (1.1.1)
+    aws-sdk-resources (2.11.490)
+      aws-sdk-core (= 2.11.490)
+    aws-sigv4 (1.1.2)
       aws-eventstream (~> 1.0, >= 1.0.2)
     babosa (1.0.3)
     chroma (0.2.0)
@@ -70,22 +70,23 @@ GEM
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.2.2)
+    cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
     cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
-    cocoapods-try (1.1.0)
+    cocoapods-try (1.2.0)
     colored (1.2)
     colored2 (3.1.2)
+    colorize (0.8.1)
     commander-fastlane (4.4.6)
       highline (~> 1.7.2)
-    commonmarker (0.20.1)
+    commonmarker (0.21.0)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     declarative (0.0.10)
     declarative-option (0.1.0)
     diffy (3.3.0)
@@ -95,7 +96,7 @@ GEM
     dotenv (2.7.5)
     emoji_regex (1.0.1)
     escape (0.0.4)
-    excon (0.72.0)
+    excon (0.73.0)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
@@ -144,6 +145,12 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-appcenter (1.7.1)
     fastlane-plugin-sentry (1.6.0)
+    fastlane-plugin-test_center (3.10.2)
+      colorize
+      json
+      plist
+      xcodeproj
+      xctest_list (>= 1.1.8)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -163,20 +170,20 @@ GEM
     google-cloud-env (1.3.1)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.0)
-    google-cloud-storage (1.25.1)
+    google-cloud-storage (1.26.0)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.11.0)
+    googleauth (0.12.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.12)
+      signet (~> 0.14)
     highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -193,7 +200,7 @@ GEM
     mini_magick (4.10.1)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.12.2)
+    minitest (5.14.0)
     molinillo (0.6.6)
     multi_json (1.14.1)
     multi_xml (0.6.0)
@@ -204,12 +211,13 @@ GEM
     netrc (0.11.0)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
+    octokit (4.18.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.10.5)
-    optimist (3.0.0)
+    oj (3.10.6)
+    optimist (3.0.1)
     options (2.3.2)
-    os (1.0.1)
+    os (1.1.0)
     parallel (1.19.1)
     plist (3.5.0)
     progress_bar (1.3.1)
@@ -227,15 +235,15 @@ GEM
     retriable (3.1.2)
     rmagick (3.2.0)
     rouge (2.0.7)
-    ruby-enum (0.7.2)
+    ruby-enum (0.8.0)
       i18n
     ruby-macho (1.4.0)
     rubyzip (1.3.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     security (0.1.3)
-    signet (0.13.0)
+    signet (0.14.0)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
@@ -252,15 +260,15 @@ GEM
     tty-screen (0.7.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.14.0)
+    xcodeproj (1.16.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -270,6 +278,7 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.0)
       xcpretty (~> 0.2, >= 0.0.7)
+    xctest_list (1.1.8)
 
 PLATFORMS
   ruby
@@ -281,6 +290,7 @@ DEPENDENCIES
   fastlane (= 2.143.0)!
   fastlane-plugin-appcenter (= 1.7.1)
   fastlane-plugin-sentry
+  fastlane-plugin-test_center
   fastlane-plugin-wpmreleasetoolkit!
   octokit (~> 4.0)!
   rake!
@@ -289,4 +299,4 @@ DEPENDENCIES
   xcpretty-travis-formatter!
 
 BUNDLED WITH
-   2.0.2
+   2.1.4
diff --git a/Podfile b/Podfile
@@ -34,7 +34,7 @@ end
 
 def wordpress_ui
     ## for production:
-    pod 'WordPressUI', '~> 1.5.3-beta.1'
+    pod 'WordPressUI', '~> 1.5.3'
 
     ## for development:
     #pod 'WordPressUI', :path => '../WordPressUI-iOS'
@@ -44,9 +44,8 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.7.1-beta.1'
-
-    #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => '4.6.0-beta.3'
+    pod 'WordPressKit', '~> 4.8.0'
+    #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
     #pod 'WordPressKit', :path => '../WordPressKit-iOS'
@@ -120,7 +119,6 @@ def gutenberg_dependencies(options)
         'react-native-safe-area',
         'react-native-video',
         'RNSVG',
-        'ReactNativeDarkMode',
         'react-native-slider',
         'react-native-linear-gradient'
     ]
@@ -149,7 +147,7 @@ target 'WordPress' do
     ## Gutenberg (React Native)
     ## =====================
     ##
-    gutenberg :commit => 'fe07af1691e4f5f869e4824ebf26a9b8326bafec'
+    gutenberg :commit => '330c3998bc263e727573901600be108ee88ed878'
 
     ## Third party libraries
     ## =====================
@@ -185,11 +183,11 @@ target 'WordPress' do
 
     pod 'Gridicons', '~> 1.0.1'
 
-    pod 'WordPressAuthenticator', '~> 1.12.1'
+    pod 'WordPressAuthenticator', '~> 1.13.0'
     # While in PR
-    #pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
-    #pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
-    #pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
+    # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
+    # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
+    # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
 
     pod 'MediaEditor', '~> 1.0.1'
     # pod 'MediaEditor', :git => 'https://github.com/wordpress-mobile/MediaEditor-iOS.git', :commit => 'a4178ed9b0f3622faafb41dd12503e26c5523a32'