Merge pull request #12516 from wordpress-mobile/merge/13.2.1-into-dev…

…elop Merge 13.2.1 into develop
wordpress-mobile · Sep 23, 2019 · ed5c30f · ed5c30f
2 parents 36933af + fdb42a5
commit ed5c30f
Show file tree

Hide file tree

Showing 82 changed files with 854 additions and 463 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,24 +4,35 @@ orbs:
   ios: wordpress-mobile/ios@0.0.31
   git: wordpress-mobile/git@0.0.31
 
+commands:
+  load-chruby:
+    steps:
+      - run:
+          name: Load chruby
+          command: |
+            # Force chruby to load to work around CircleCI Xcode 11 image issue
+            echo 'source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby 2.5.5' >> $BASH_ENV
+
 jobs:
   unit-tests:
     executor:
       name: ios/default
-      xcode-version: "10.2.0"
+      xcode-version: "11.0.0"
     steps:
       - git/shallow-checkout
+      - load-chruby
       - ios/test:
-          xcode-version: "10.2.0"
+          xcode-version: "11.0.0"
           workspace: WordPress.xcworkspace
           scheme: WordPress
-          device: iPhone XS
+          device: iPhone 11 
   build-ui-tests:
     executor:
       name: ios/default
-      xcode-version: "10.2.0"
+      xcode-version: "11.0.0"
     steps:
       - git/shallow-checkout
+      - load-chruby
       - ios/install-dependencies:
           bundle-install: true
           pod-install: true
@@ -39,10 +50,10 @@ jobs:
         type: string
     executor:
       name: ios/default
-      xcode-version: "10.2.0"
+      xcode-version: "11.0.0"
     steps:
       - ios/boot-simulator:
-          xcode-version: "10.2.0"
+          xcode-version: "11.0.0"
           device: << parameters.device >>
       - attach_workspace:
           at: ./
@@ -53,7 +64,7 @@ jobs:
       - ios/wait-for-simulator
       - ios/xcodebuild:
           command: test-without-building
-          arguments: -xctestrun DerivedData/Build/Products/WordPressUITests_iphonesimulator12.2-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID"
+          arguments: -xctestrun DerivedData/Build/Products/WordPressUITests_iphonesimulator13.0-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID"
       - ios/save-xcodebuild-artifacts
 
 workflows:
@@ -66,10 +77,10 @@ workflows:
       - build-ui-tests:
           name: Build UI Tests
       - run-ui-tests:
-          name: UI Tests (iPhone Xs)
-          device: iPhone Xs
+          name: UI Tests (iPhone 11)
+          device: iPhone 11
           requires: [ "Build UI Tests" ]
       - run-ui-tests:
-          name: UI Tests (iPad 6th generation)
-          device: iPad \\(6th generation\\)
+          name: UI Tests (iPad Air 6th generation)
+          device: iPad Air \\(3rd generation\\)
           requires: [ "Build UI Tests" ]
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.3.0
+2.5.5
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -266,4 +266,4 @@ DEPENDENCIES
   xcpretty-travis-formatter!
 
 BUNDLED WITH
-   1.17.3
+   2.0.2
diff --git a/Podfile b/Podfile
@@ -155,7 +155,7 @@ target 'WordPress' do
     pod 'MRProgress', '0.8.3'
     pod 'Starscream', '3.0.6'
     pod 'SVProgressHUD', '2.2.5'
-    pod 'ZendeskSDK', '3.0.1'
+    pod 'ZendeskSDK', :git => 'https://github.com/zendesk/zendesk_sdk_ios', :tag => '3.0.1-swift5.1-GM'
     pod 'AlamofireNetworkActivityIndicator', '~> 2.3'
     pod 'FSInteractiveMap', :git => 'https://github.com/wordpress-mobile/FSInteractiveMap.git', :tag => '0.1.1'
 
@@ -176,7 +176,7 @@ target 'WordPress' do
 
     pod 'Gridicons', '~> 0.16'
 
-    pod 'WordPressAuthenticator', '~> 1.8.1-beta.2'
+    pod 'WordPressAuthenticator', '~> 1.9.0-beta.1'
     # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
     # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
 
@@ -191,23 +191,7 @@ target 'WordPress' do
     end
 
 
-    post_install do
-
-        ## Append SDKVersions.xcconfig contents to WordPressAuthenticator config files
-        Dir.glob("Pods/Target Support Files/WordPressAuthenticator/*.xcconfig") do |xc_config_filename|
-
-          ## Get WPAuth config file
-          xcconfig_path = "#{Dir.pwd}/#{xc_config_filename}"
-          xc_config = File.read(xcconfig_path)
-
-          ## Get WPiOS config file
-          custom_xcconfig_path = "#{Dir.pwd}/config/SDKVersions.xcconfig"
-          custom_xc_config = File.read(custom_xcconfig_path)
-
-          ## Write back to WPAuth config file, appending both configs.
-          File.open(xcconfig_path, 'w') { |file| file << xc_config << custom_xc_config }
-        end
-
+    post_install do      
 
         ## Convert the 3rd-party license acknowledgements markdown into html for use in the app
         require 'commonmarker'
@@ -225,6 +209,12 @@ target 'WordPress' do
                              color: #1a1a1a;
                              margin: 20px;
                            }
+                          @media (prefers-color-scheme: dark) {
+                           body {
+                            background: #1a1a1a;
+                            color: white;
+                           }
+                          }
                            pre {
                             white-space: pre-wrap;
                            }
@@ -238,7 +228,7 @@ target 'WordPress' do
                        </body>"
 
           ## Remove the <h1>, since we've promoted it to <title>
-          styled_html = styled_html.sub("<h1>#{acknowledgements}</h1>", '')
+          styled_html = styled_html.sub("<h1>Acknowledgements</h1>", '')
 
           ## The glog library's license contains a URL that does not wrap in the web view,
           ## leading to a large right-hand whitespace gutter.  Work around this by explicitly

diff --git a/Podfile.lock b/Podfile.lock
@@ -211,7 +211,7 @@ PODS:
   - WordPress-Aztec-iOS (1.9.0)
   - WordPress-Editor-iOS (1.9.0):
     - WordPress-Aztec-iOS (= 1.9.0)
-  - WordPressAuthenticator (1.8.1-beta.2):
+  - WordPressAuthenticator (1.9.0-beta.1):
     - 1PasswordExtension (= 1.8.5)
     - Alamofire (= 4.7.3)
     - CocoaLumberjack (~> 3.5)
@@ -301,14 +301,14 @@ DEPENDENCIES:
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.9.0)
-  - WordPressAuthenticator (~> 1.8.1-beta.2)
+  - WordPressAuthenticator (~> 1.9.0-beta.1)
   - WordPressKit (~> 4.5.0)
   - WordPressMocks (~> 0.0.5)
   - WordPressShared (~> 1.8.7)
   - WordPressUI (~> 1.3.5)
   - WPMediaPicker (~> 1.4.2)
   - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.12.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`)
-  - ZendeskSDK (= 3.0.1)
+  - ZendeskSDK (from `https://github.com/zendesk/zendesk_sdk_ios`, tag `3.0.1-swift5.1-GM`)
   - ZIPFoundation (~> 0.9.8)
 
 SPEC REPOS:
@@ -352,7 +352,6 @@ SPEC REPOS:
     - WordPressUI
     - WPMediaPicker
     - wpxmlrpc
-    - ZendeskSDK
     - ZIPFoundation
 
 EXTERNAL SOURCES:
@@ -415,6 +414,9 @@ EXTERNAL SOURCES:
     :tag: v1.12.0
   yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.12.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json
+  ZendeskSDK:
+    :git: https://github.com/zendesk/zendesk_sdk_ios
+    :tag: 3.0.1-swift5.1-GM
 
 CHECKOUT OPTIONS:
   FSInteractiveMap:
@@ -426,6 +428,9 @@ CHECKOUT OPTIONS:
   RNTAztecView:
     :git: http://github.com/wordpress-mobile/gutenberg-mobile/
     :tag: v1.12.0
+  ZendeskSDK:
+    :git: https://github.com/zendesk/zendesk_sdk_ios
+    :tag: 3.0.1-swift5.1-GM
 
 SPEC CHECKSUMS:
   1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
@@ -487,17 +492,17 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
   WordPress-Aztec-iOS: e58c7ab55b0bae53418a705876093fed314b6586
   WordPress-Editor-iOS: 36114a1e155b0696939dba80989652c185e91e01
-  WordPressAuthenticator: 989acfe503d267e15d154d0c9ac9d5aab5792886
+  WordPressAuthenticator: a31342777b1da48c99682a0ba30d19556a0d29fb
   WordPressKit: 87ba4cce3f5269e26a09568a749ec1b8b2ba2267
   WordPressMocks: d8088f718439556ff3856d5881aef581740cd26a
   WordPressShared: 09cf184caa614835f5811e8609227165201e6d3e
   WordPressUI: 1b006c7440e85e724b9773c7ebe3a2e783f70941
   WPMediaPicker: 1897f312c7b41114ffd239fb782431ae602134a1
   wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
   yoga: 4e71c9a33abf45ba55af55ae9cbc86f4234bb2a9
-  ZendeskSDK: c2e49fd16a73e43e490f777cea67dd852b819ace
+  ZendeskSDK: 787414f9240ee6ef8cfe4ea0f00e8b4d01d2d264
   ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef
 
-PODFILE CHECKSUM: 5ff5652c0dd0bbb1edf03cac2ac86c8036f0338b
+PODFILE CHECKSUM: 4dd43238d873a8076ac3874590245bf83523e8f4
 
 COCOAPODS: 1.7.5
diff --git a/Scripts/fastlane/Deliverfile b/Scripts/fastlane/Deliverfile
@@ -5,7 +5,7 @@ screenshots_path "./screenshots/"
 app_identifier "org.wordpress"
 
 # Make sure to update these keys for a new version
-app_version "13.2.1"
+app_version "13.2.2"
 
 privacy_url({
   'default' => 'https://automattic.com/privacy/',
-Original file line number
+Diff line change
@@ Expand Up / @@ -266,4 +266,4 @@ DEPENDENCIES @@
       xcpretty-travis-formatter!
     BUNDLED WITH
-.17.3
+.0.2