Merge remote-tracking branch 'origin/develop' into gutenberg/fix-i18n

.circleci/config.yml

@@ -13,6 +13,18 @@ commands:
           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
+  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:
@@ -49,8 +61,9 @@ jobs:
       - ios/wait-for-simulator
       - ios/xcodebuild:
           command: test-without-building
-          arguments: -xctestrun DerivedData/Build/Products/WordPress_iphonesimulator13.0-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID"
+          arguments: -xctestrun DerivedData/Build/Products/WordPress_iphonesimulator13.0-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID" -resultBundlePath test-without-building.xcresult
       - ios/save-xcodebuild-artifacts
+      - save-xcresult
   UI Tests:
     parameters:
       device:
@@ -71,8 +84,9 @@ jobs:
       - ios/wait-for-simulator
       - ios/xcodebuild:
           command: test-without-building
-          arguments: -xctestrun DerivedData/Build/Products/WordPressUITests_iphonesimulator13.0-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" -resultBundlePath test-without-building.xcresult
       - ios/save-xcodebuild-artifacts
+      - save-xcresult
   Installable Build:
     executor:
       name: ios/default

MIGRATIONS.md

@@ -3,6 +3,12 @@
 This file documents changes in the data model. Please explain any changes to the
 data model as well as any custom migrations.
 
+## WordPress 93
+
+@guarani 2019-10-27
+
+- `AbstractPost` added `autosaveTitle` (`nullable` `String`), `autosaveExcerpt` (`nullable` `String`), `autosaveContent` (`nullable` `String`), and `autosaveModifiedDate` (`nullable` `Date`) properties.
+
 ## WordPress 92
 
 @jklausa 2019-08-19

Podfile

@@ -34,17 +34,17 @@ end
 
 def wordpress_ui
     ## for production:
-    pod 'WordPressUI', '~> 1.4'
+    pod 'WordPressUI', '~> 1.5.0'
 
     ## for development:
-    # pod 'WordPressUI', :path => '../WordPressUI-iOS'
+    #pod 'WordPressUI', :path => '../WordPressUI-iOS'
     ## while PR is in review:
-    # pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :branch => 'update-fancy-button-style'
+    #pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :branch => ''
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.5.2-beta.1'
-    #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
+    pod 'WordPressKit', '~> 4.5.3-beta.2'
+    #pod 'WordPressKit', :git => 'https://github.com/guarani/WordPressKit-iOS.git', :branch => 'issue/12141-restore-revision-dialog'
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
     #pod 'WordPressKit', :path => '../WordPressKit-iOS'
 end
@@ -148,12 +148,11 @@ target 'WordPress' do
     pod '1PasswordExtension', '1.8.5'
     pod 'Charts', '~> 3.2.2'
     pod 'Gifu', '3.2.0'
-    pod 'Giphy', '1.1.3'
     pod 'HockeySDK', '5.1.4', :configurations => ['Release-Internal', 'Release-Alpha']
     pod 'MRProgress', '0.8.3'
     pod 'Starscream', '3.0.6'
     pod 'SVProgressHUD', '2.2.5'
-    pod 'ZendeskSDK', :git => 'https://github.com/zendesk/zendesk_sdk_ios', :tag => '3.0.1-swift5.1-GM'
+    pod 'ZendeskSDK', :git => 'https://github.com/zendesk/zendesk_sdk_ios', :tag => '3.0.2'
     pod 'AlamofireNetworkActivityIndicator', '~> 2.3'
     pod 'FSInteractiveMap', :git => 'https://github.com/wordpress-mobile/FSInteractiveMap.git', :tag => '0.2.0'
 
@@ -174,9 +173,9 @@ target 'WordPress' do
 
     pod 'Gridicons', '~> 0.16'
 
-    pod 'WordPressAuthenticator', '~> 1.10.1'
+    pod 'WordPressAuthenticator', '~> 1.10.2'
     # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
-    # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'fancy-button-border-style'
+    # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
 
     aztec
     wordpress_ui
@@ -307,45 +306,16 @@ target 'WordPressNotificationServiceExtension' do
 end
 
 
-
-## WordPress.com Stats
+## Mocks
 ## ===================
 ##
-target 'WordPressComStatsiOS' do
-    project 'WordPressComStatsiOS/WordPressComStatsiOS.xcodeproj'
-
-    shared_with_all_pods
-    shared_with_networking_pods
-
-    ## Automattic libraries
-    ## ====================
-    ##
-    wordpress_ui
-end
-
-## WordPress.com Stats Tests
-## =========================
-##
-target 'WordPressComStatsiOSTests' do
-  project 'WordPressComStatsiOS/WordPressComStatsiOS.xcodeproj'
-
-  shared_with_all_pods
-  shared_with_networking_pods
-
-  ## Automattic libraries
-  ## ====================
-  ##
-  wordpress_ui
-
-  shared_test_pods
-end
-
 def wordpress_mocks
   pod 'WordPressMocks', '~> 0.0.6'
   # pod 'WordPressMocks', :git => 'https://github.com/wordpress-mobile/WordPressMocks.git', :commit => ''
   # pod 'WordPressMocks', :path => '../WordPressMocks'
 end
 
+
 ## Screenshot Generation
 ## ===================
 ##
@@ -371,7 +341,7 @@ end
 # Make all pods that are not shared across multiple targets into static frameworks by overriding the static_framework? function to return true
 # Linking the shared frameworks statically would lead to duplicate symbols
 # A future version of CocoaPods may make this easier to do. See https://github.com/CocoaPods/CocoaPods/issues/7428
-shared_targets = ['WordPressFlux', 'WordPressComStatsiOS']
+shared_targets = ['WordPressFlux']
 pre_install do |installer|
     static = []
     dynamic = []