Merge branch 'trunk' into task/22721-stats-traffic-improve-scrolling-…

…performance
wordpress-mobile · Jun 21, 2024 · 465047a · 465047a
2 parents bc88b72 + 6dc78ec
commit 465047a
Show file tree

Hide file tree

Showing 1,126 changed files with 119,151 additions and 10,134 deletions.
diff --git a/.buildkite/commands/run-pod-tests.sh b/.buildkite/commands/run-pod-tests.sh
@@ -0,0 +1,49 @@
+#!/bin/bash -eu
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :cocoapods: Setting up Pods"
+install_cocoapods
+
+echo "--- :writing_hand: Copy Files"
+mkdir -pv ~/.configure/wordpress-ios/secrets
+cp -v fastlane/env/project.env-example ~/.configure/wordpress-ios/secrets/project.env
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- :swift: Setting up Swift Packages"
+install_swiftpm_dependencies
+
+scheme=$1
+echo "--- 🔬 Testing $scheme"
+set +e
+bundle exec fastlane test_pod "name:$scheme"
+TESTS_EXIT_STATUS=$?
+set -e
+
+if [[ $TESTS_EXIT_STATUS -ne 0 ]]; then
+  # Keep the (otherwise collapsed) current "Testing" section open in Buildkite logs on error. See https://buildkite.com/docs/pipelines/managing-log-output#collapsing-output
+  echo "^^^ +++"
+  echo "Unit Tests failed!"
+fi
+
+echo "--- 📦 Zipping test results"
+cd build/results/ && zip -rq "$scheme.xcresult.zip" "$scheme.xcresult" && cd -
+
+echo "--- 🚦 Report Tests Status"
+if [[ $TESTS_EXIT_STATUS -eq 0 ]]; then
+  echo "Unit Tests seems to have passed (exit code 0). All good 👍"
+else
+  echo "The Unit Tests, ran during the '🔬 Testing' step above, have failed."
+  echo "For more details about the failed tests, check the Buildkite annotation, the logs under the '🔬 Testing' section and the \`.xcresult\` and test reports in Buildkite artifacts."
+fi
+
+if [[ $BUILDKITE_BRANCH == trunk ]] || [[ $BUILDKITE_BRANCH == release/* ]]; then
+    annotate_test_failures "build/results/$scheme.xml" --slack "build-and-ship"
+else
+    annotate_test_failures "build/results/$scheme.xml"
+fi
+
+exit $TESTS_EXIT_STATUS
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -59,6 +59,15 @@ steps:
       - github_commit_status:
           context: "Unit Tests"
 
+  - label: "🔬 :wordpress: Tests {{ matrix }}"
+    command: ".buildkite/commands/run-pod-tests.sh {{ matrix }}"
+    plugins: [$CI_TOOLKIT_PLUGIN]
+    artifact_paths:
+      - "build/results/*"
+    matrix:
+      - WordPressKit
+      - WordPressAuthenticator
+
   #################
   # UI Tests
   #################

diff --git a/Gemfile b/Gemfile
@@ -6,9 +6,11 @@ gem 'cocoapods', '~> 1.14'
 gem 'commonmarker'
 gem 'danger-dangermattic', '~> 1.0'
 gem 'dotenv'
-# 2.219.0 includes a fix for a bug introduced in 2.218.0
-# See https://github.com/fastlane/fastlane/issues/21762#issuecomment-1875208663
-gem 'fastlane', '~> 2.219'
+# 2.221.0 includes a fix for an ASC-interfacing bug
+#
+# See https://github.com/wordpress-mobile/WordPress-iOS/pull/23118#issuecomment-2173254418
+# and https://github.com/fastlane/fastlane/pull/21995
+gem 'fastlane', '~> 2.221'
 gem 'fastlane-plugin-appcenter', '~> 2.1'
 gem 'fastlane-plugin-sentry'
 # This comment avoids typing to switch to a development version for testing.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -24,17 +24,17 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.926.0)
-    aws-sdk-core (3.194.2)
+    aws-partitions (1.944.0)
+    aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.80.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.85.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.149.1)
-      aws-sdk-core (~> 3, >= 3.194.0)
+    aws-sdk-s3 (1.152.3)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -163,7 +163,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.220.0)
+    fastlane (2.221.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -268,22 +268,22 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    mini_magick (4.12.0)
+    mini_magick (4.13.1)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
     minitest (5.22.3)
@@ -329,7 +329,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.9)
+      strscan
     rmagick (3.2.0)
     rouge (2.0.7)
     rubocop (1.63.1)
@@ -363,6 +364,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -398,7 +400,7 @@ DEPENDENCIES
   commonmarker
   danger-dangermattic (~> 1.0)
   dotenv
-  fastlane (~> 2.219)
+  fastlane (~> 2.221)
   fastlane-plugin-appcenter (~> 2.1)
   fastlane-plugin-sentry
   fastlane-plugin-wpmreleasetoolkit (~> 11.0)

diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml
@@ -9,6 +9,6 @@
  #
  #   LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install
 ref:
-  tag: v1.120.0
+  tag: v1.120.1
 github_org: wordpress-mobile
 repo_name: gutenberg-mobile
diff --git a/Podfile b/Podfile
@@ -58,10 +58,7 @@ def gravatar
 end
 
 def wordpress_kit
-  pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: 'c334dad3c0e8fced5a61c5bf1d745d23d1924a9c'
-  # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: ''
-  # pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: ''
-  # pod 'WordPressKit', path: '../WordPressKit-iOS'
+  pod 'WordPressKit', path: './WordPressKit', testspecs: ['Tests']
 end
 
 def kanvas
@@ -152,10 +149,7 @@ abstract_target 'Apps' do
 
   pod 'NSURL+IDN', '~> 0.4'
 
-  pod 'WordPressAuthenticator', '~> 9.0', '>= 9.0.8'
-  # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: ''
-  # pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: ''
-  # pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS'
+  pod 'WordPressAuthenticator', path: './WordPressAuthenticator', testspecs: ['Tests']
 
   pod 'MediaEditor', '~> 1.2', '>= 1.2.2'
   # pod 'MediaEditor', git: 'https://github.com/wordpress-mobile/MediaEditor-iOS.git', commit: ''

diff --git a/Podfile.lock b/Podfile.lock
@@ -23,13 +23,14 @@ PODS:
     - CocoaLumberjack/Core
   - CropViewController (2.5.3)
   - Down (0.6.6)
+  - Expecta (1.0.6)
   - FSInteractiveMap (0.1.0)
   - Gifu (3.3.1)
   - Gravatar (2.0.0)
   - GravatarUI (2.0.0):
     - Gravatar (= 2.0.0)
   - Gridicons (1.2.0)
-  - Gutenberg (1.120.0)
+  - Gutenberg (1.120.1)
   - JTAppleCalendar (8.0.5)
   - Kanvas (1.4.9):
     - CropViewController
@@ -38,6 +39,8 @@ PODS:
   - NSObject-SafeExpectations (0.0.6)
   - "NSURL+IDN (0.4)"
   - OCMock (3.4.3)
+  - OHHTTPStubs (9.1.0):
+    - OHHTTPStubs/Default (= 9.1.0)
   - OHHTTPStubs/Core (9.1.0)
   - OHHTTPStubs/Default (9.1.0):
     - OHHTTPStubs/Core
@@ -59,6 +62,7 @@ PODS:
     - SentryPrivate (= 8.21.0)
   - SentryPrivate (8.21.0)
   - Sodium (0.9.1)
+  - Specta (1.0.7)
   - Starscream (4.0.8)
   - SVProgressHUD (2.2.5)
   - SwiftLint (0.54.0)
@@ -73,11 +77,30 @@ PODS:
     - WordPressKit (~> 17.0)
     - WordPressShared (~> 2.1-beta)
     - WordPressUI (~> 1.7-beta)
+  - WordPressAuthenticator/Tests (9.0.8):
+    - Expecta (= 1.0.6)
+    - Gridicons (~> 1.0)
+    - "NSURL+IDN (= 0.4)"
+    - OCMock (~> 3.4)
+    - Specta (= 1.0.7)
+    - SVProgressHUD (~> 2.2.5)
+    - WordPressKit (~> 17.0)
+    - WordPressShared (~> 2.1-beta)
+    - WordPressUI (~> 1.7-beta)
   - WordPressKit (17.2.0):
     - NSObject-SafeExpectations (~> 0.0.4)
     - UIDeviceIdentifier (~> 2.0)
     - WordPressShared (~> 2.0-beta)
     - wpxmlrpc (~> 0.10)
+  - WordPressKit/Tests (17.2.0):
+    - Alamofire (~> 5.0)
+    - NSObject-SafeExpectations (~> 0.0.4)
+    - OCMock (~> 3.4)
+    - OHHTTPStubs (~> 9.0)
+    - OHHTTPStubs/Swift (~> 9.0)
+    - UIDeviceIdentifier (~> 2.0)
+    - WordPressShared (~> 2.0-beta)
+    - wpxmlrpc (~> 0.10)
   - WordPressShared (2.4.0)
   - WordPressUI (1.16.0)
   - wpxmlrpc (0.10.0)
@@ -110,7 +133,7 @@ DEPENDENCIES:
   - Gravatar (= 2.0.0)
   - GravatarUI (= 2.0.0)
   - Gridicons (~> 1.2)
-  - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.0.podspec`)
+  - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec`)
   - JTAppleCalendar (~> 8.0.5)
   - Kanvas (~> 1.4.4)
   - MediaEditor (>= 1.2.2, ~> 1.2)
@@ -123,8 +146,10 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - SwiftLint (= 0.54.0)
   - WordPress-Editor-iOS (~> 1.19.11)
-  - WordPressAuthenticator (>= 9.0.8, ~> 9.0)
-  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `c334dad3c0e8fced5a61c5bf1d745d23d1924a9c`)
+  - WordPressAuthenticator (from `./WordPressAuthenticator`)
+  - WordPressAuthenticator/Tests (from `./WordPressAuthenticator`)
+  - WordPressKit (from `./WordPressKit`)
+  - WordPressKit/Tests (from `./WordPressKit`)
   - WordPressShared (>= 2.3.1, ~> 2.3)
   - WordPressUI (~> 1.16)
   - ZendeskSupportSDK (= 5.3.0)
@@ -134,7 +159,6 @@ SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
-    - WordPressAuthenticator
     - WordPressShared
   trunk:
     - Alamofire
@@ -145,6 +169,7 @@ SPEC REPOS:
     - CocoaLumberjack
     - CropViewController
     - Down
+    - Expecta
     - Gifu
     - Gravatar
     - GravatarUI
@@ -160,6 +185,7 @@ SPEC REPOS:
     - Sentry
     - SentryPrivate
     - Sodium
+    - Specta
     - Starscream
     - SVProgressHUD
     - SwiftLint
@@ -180,18 +206,16 @@ EXTERNAL SOURCES:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
   Gutenberg:
-    :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.0.podspec
+    :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec
+  WordPressAuthenticator:
+    :path: "./WordPressAuthenticator"
   WordPressKit:
-    :commit: c334dad3c0e8fced5a61c5bf1d745d23d1924a9c
-    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
+    :path: "./WordPressKit"
 
 CHECKOUT OPTIONS:
   FSInteractiveMap:
     :git: https://github.com/wordpress-mobile/FSInteractiveMap.git
     :tag: 0.2.0
-  WordPressKit:
-    :commit: c334dad3c0e8fced5a61c5bf1d745d23d1924a9c
-    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 SPEC CHECKSUMS:
   Alamofire: 02b772c9910e8eba1a079227c32fbd9e46c90a24
@@ -202,12 +226,13 @@ SPEC CHECKSUMS:
   CocoaLumberjack: 78abfb691154e2a9df8ded4350d504ee19d90732
   CropViewController: a5c143548a0fabcd6cc25f2d26e40460cfb8c78c
   Down: 71bf4af3c04fa093e65dffa25c4b64fa61287373
+  Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
   FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
   Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842
   Gravatar: 54fc63ea6298e9afca7329007815be25868f1dfe
   GravatarUI: bb5e03cda2da61e54aa1c20d4dde32b7153fa8b4
   Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
-  Gutenberg: a0cc56d764e14caf66c8a057255106a62808dd98
+  Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391
   JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73
   Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08
   MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
@@ -219,14 +244,15 @@ SPEC CHECKSUMS:
   Sentry: ebc12276bd17613a114ab359074096b6b3725203
   SentryPrivate: d651efb234cf385ec9a1cdd3eff94b5e78a0e0fe
   Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da
+  Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
   Starscream: 19b5533ddb925208db698f0ac508a100b884a1b9
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
   UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
   WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
   WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c
-  WordPressAuthenticator: 898acaac75c5ade9b900c02622a15b9aef8fde1a
-  WordPressKit: 98809cdb460bacc6634b49079335a5ccace34e59
+  WordPressAuthenticator: 292575eec74da4d328df6cf3c538dbc9a8504eb7
+  WordPressKit: 2e8894b5713929ab3085411bc109e8fa8abb70fc
   WordPressShared: 0160364ed24f4d67fed4e85003fefa837faad84f
   WordPressUI: ec5ebcf7e63e797ba51d07513e340c1b14cf45a4
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
@@ -239,6 +265,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: 4e9da8dde686f4a307c1014ebf43d20c689003e6
+PODFILE CHECKSUM: 6f6fc1319d254884bd93ef1f6d3f2478fa9f49f5
 
 COCOAPODS: 1.15.2