Merge remote-tracking branch 'origin/trunk' into add/installable-builds-to-prs

# Conflicts:
#	.circleci/config.yml
#	Gemfile.lock

Author: jkmassel

.buildkite/commands/build-for-testing.sh

@@ -15,6 +15,9 @@ cp -v fastlane/env/project.env-example .configure-files/project.env
 mkdir -pv ~/.configure/wordpress-ios/secrets
 cp -v fastlane/env/project.env-example ~/.configure/wordpress-ios/secrets/project.env
 
+echo "--- Installing Secrets"
+bundle exec fastlane run configure_apply
+
 echo "--- :hammer_and_wrench: Building"
 bundle exec fastlane build_for_testing
 

.circleci/config.yml

@@ -247,7 +247,7 @@ workflows:
       - Unit Tests:
           <<: *iphone_test_device
           requires: [ "Build Tests" ]
-      # Always run UI tests on develop and release branches
+      # Always run UI tests on trunk and release branches
       - UI Tests:
           name: UI Tests (iPhone)
           <<: *iphone_test_device
@@ -256,7 +256,7 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - trunk
                 - /^release.*/
                 - /^gutenberg\/integrate_release_.*/
       - UI Tests:
@@ -267,7 +267,7 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - trunk
                 - /^release.*/
                 - /^gutenberg\/integrate_release_.*/
       - Build Jetpack:
@@ -279,7 +279,7 @@ workflows:
           filters:
             branches:
               ignore:
-                - develop
+                - trunk
                 - /^release.*/
                 - /^gutenberg\/integrate_release_.*/
       - UI Tests:

Gemfile.lock

@@ -1,22 +1,3 @@
-GIT
-  remote: git@github.com:wordpress-mobile/release-toolkit
-  revision: b72dd836bd95f195d5da804b887a22971a999006
-  branch: develop
-  specs:
-    fastlane-plugin-wpmreleasetoolkit (2.1.0)
-      activesupport (~> 5)
-      bigdecimal (~> 1.4)
-      chroma (= 0.2.0)
-      diffy (~> 3.3)
-      git (~> 1.3)
-      jsonlint (~> 0.3)
-      nokogiri (~> 1.11)
-      octokit (~> 4.18)
-      parallel (~> 1.14)
-      progress_bar (~> 1.3)
-      rake (>= 12.3, < 14.0)
-      rake-compiler (~> 1.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -184,11 +165,24 @@ GEM
       trainer
       xcodeproj
       xctest_list (>= 1.2.1)
+    fastlane-plugin-wpmreleasetoolkit (2.3.0)
+      activesupport (~> 5)
+      bigdecimal (~> 1.4)
+      chroma (= 0.2.0)
+      diffy (~> 3.3)
+      git (~> 1.3)
+      jsonlint (~> 0.3)
+      nokogiri (~> 1.11)
+      octokit (~> 4.18)
+      parallel (~> 1.14)
+      progress_bar (~> 1.3)
+      rake (>= 12.3, < 14.0)
+      rake-compiler (~> 1.0)
     ffi (1.15.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    git (1.9.1)
+    git (1.10.2)
       rchardet (~> 1.8)
     google-apis-androidpublisher_v3 (0.11.0)
       google-apis-core (>= 0.4, < 2.a)
@@ -243,7 +237,7 @@ GEM
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.1)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.7.1)
     minitest (5.14.4)
     molinillo (0.6.6)
     multi_json (1.15.0)
@@ -252,13 +246,13 @@ GEM
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.13.9)
+    oj (3.13.11)
     optimist (3.0.1)
     options (2.3.2)
     optparse (0.1.1)
@@ -271,7 +265,7 @@ GEM
     public_suffix (4.0.6)
     racc (1.6.0)
     rake (13.0.6)
-    rake-compiler (1.1.1)
+    rake-compiler (1.1.9)
       rake
     rchardet (1.8.0)
     representable (3.1.1)
@@ -346,7 +340,7 @@ DEPENDENCIES
   fastlane-plugin-appcenter (~> 1.8)
   fastlane-plugin-sentry
   fastlane-plugin-test_center
-  fastlane-plugin-wpmreleasetoolkit!
+  fastlane-plugin-wpmreleasetoolkit (~> 2.3)
   octokit (~> 4.0)
   rake
   rmagick (~> 3.2.0)

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 137
+
+@dvdchr 2021-11-26
+
+- `Comment`: added `authorID` attribute. (optional, default `0`, `Int 32`)
+
 ## WordPress 134
 
 @dvdchr 2021-10-14

Podfile

@@ -20,7 +20,7 @@ workspace 'WordPress.xcworkspace'
 ## ===================================
 ##
 def wordpress_shared
-    pod 'WordPressShared', '~> 1.16.2'
+    pod 'WordPressShared', '~> 1.17.0'
     #pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :tag => ''
     #pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => ''
     #pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit  => ''
@@ -35,19 +35,19 @@ def aztec
     #pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => ''
     #pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :tag => ''
     #pod 'WordPress-Editor-iOS', :path => '../AztecEditor-iOS'
-    pod 'WordPress-Editor-iOS', '~> 1.19.5'
+    pod 'WordPress-Editor-iOS', '~> 1.19.7'
 end
 
 def wordpress_ui
-    pod 'WordPressUI', '~> 1.12.2'
+    pod 'WordPressUI', '~> 1.12.3'
     #pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :tag => ''
     #pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :branch => ''
     #pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :commit => ''
     #pod 'WordPressUI', :path => '../WordPressUI-iOS'
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.44.0-beta'
+    pod 'WordPressKit', '~> 4.47.0-beta.1'
     # 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 => ''
@@ -121,8 +121,10 @@ def gutenberg_dependencies(options)
         'React-jsinspector',
         'React-jsi',
         'React-jsiexecutor',
+        'React-logger',
         'React-perflogger',
         'React-runtimeexecutor',
+        'boost',
         'Yoga',
         'RCT-Folly',
         'glog',
@@ -139,7 +141,8 @@ def gutenberg_dependencies(options)
         'RNScreens',
         'RNReanimated',
         'RNGestureHandler',
-        'RNCMaskedView'
+        'RNCMaskedView',
+        'RNCClipboard'
     ]
     if options[:path]
         podspec_prefix = options[:path]
@@ -166,7 +169,7 @@ abstract_target 'Apps' do
     ## Gutenberg (React Native)
     ## =====================
     ##
-    gutenberg :tag => 'v1.66.0'
+    gutenberg :tag => 'v1.70.0'
 
     ## Third party libraries
     ## =====================
@@ -199,23 +202,23 @@ abstract_target 'Apps' do
 
     # Production
 
-    pod 'Automattic-Tracks-iOS', '~> 0.9.1'
+    pod 'Automattic-Tracks-iOS', '~> 0.11.0'
     # While in PR
     # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => ''
     # Local Development
     #pod 'Automattic-Tracks-iOS', :path => '~/Projects/Automattic-Tracks-iOS'
 
     pod 'NSURL+IDN', '~> 0.4'
 
-    pod 'WPMediaPicker', '~> 1.7.2'
-    #pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :tag => '1.7.0'
+    pod 'WPMediaPicker', '~> 1.8.2'
+    # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :tag => '1.7.0'
     ## while PR is in review:
     # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :branch => ''
     # pod 'WPMediaPicker', :path => '../MediaPicker-iOS'
 
     pod 'Gridicons', '~> 1.1.0'
 
-    pod 'WordPressAuthenticator', '~> 1.42.1'
+    pod 'WordPressAuthenticator', '~> 1.43.0'
     # 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'
@@ -472,9 +475,12 @@ post_install do |installer|
     # =====================================
     #
     installer.pods_project.targets.each do |target|
-      target.build_configurations.each do |configuration|
-        pod_ios_deployment_target = Gem::Version.new(configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
-        configuration.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' if pod_ios_deployment_target <= app_ios_deployment_target
+      # Exclude RCT-Folly as it requires explicit deployment target https://git.io/JPb73
+      if (target.name != 'RCT-Folly')
+        target.build_configurations.each do |configuration|
+          pod_ios_deployment_target = Gem::Version.new(configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
+          configuration.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' if pod_ios_deployment_target <= app_ios_deployment_target
+        end
       end
     end