TESTING ONLY: DO NOT MERGE: Fix dictation issue on iOS

.buildkite/cache-builder.yml

@@ -7,10 +7,10 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#2.15.1
-    - automattic/git-s3-cache#1.1.4:
+    - automattic/a8c-ci-toolkit#2.13.0
+    - automattic/git-s3-cache#v1.1.3:
         bucket: "a8c-repo-mirrors"
-        repo: "automattic/wordpress-ios/"
+        repo: "wordpress-mobile/wordpress-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
     # Be sure to also update the `.xcode-version` file when updating the Xcode image/version here

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

@@ -17,12 +17,9 @@ 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"
+echo "--- Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- :hammer_and_wrench: Building"
 bundle exec fastlane build_${APP}_for_testing
 

.buildkite/commands/prototype-build-jetpack.sh

@@ -12,8 +12,5 @@ install_cocoapods
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- :hammer_and_wrench: Building"
 bundle exec fastlane build_and_upload_jetpack_prototype_build

.buildkite/commands/prototype-build-wordpress.sh

@@ -12,8 +12,5 @@ install_cocoapods
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- :hammer_and_wrench: Building"
 bundle exec fastlane build_and_upload_wordpress_prototype_build

.buildkite/commands/release-build-jetpack.sh

@@ -11,9 +11,6 @@ install_gems
 echo "--- :cocoapods: Setting up Pods"
 install_cocoapods
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 

.buildkite/commands/release-build-wordpress-internal.sh

@@ -12,9 +12,6 @@ install_gems
 echo "--- :cocoapods: Setting up Pods"
 install_cocoapods
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 

.buildkite/commands/release-build-wordpress.sh

@@ -12,9 +12,6 @@ install_gems
 echo "--- :cocoapods: Setting up Pods"
 install_cocoapods
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 

.buildkite/commands/run-ui-tests.sh

@@ -19,8 +19,8 @@ tar -xf build-products-jetpack.tar
 echo "--- :rubygems: Setting up Gems"
 install_gems
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
+echo "--- :cocoapods: Setting up Pods"
+install_cocoapods
 
 echo "--- 🔬 Testing"
 xcrun simctl list >> /dev/null
@@ -39,10 +39,6 @@ fi
 echo "--- 📦 Zipping test results"
 cd build/results/ && zip -rq JetpackUITests.xcresult.zip JetpackUITests.xcresult && cd -
 
-echo "--- 💥 Collecting Crash reports"
-mkdir -p build/results/crashes
-find ~/Library/Logs/DiagnosticReports -name '*.ips' -exec cp "{}" "build/results/crashes/" \;
-
 echo "--- 🚦 Report Tests Status"
 if [[ $TESTS_EXIT_STATUS -eq 0 ]]; then
   echo "UI Tests seems to have passed (exit code 0). All good 👍"

.buildkite/commands/run-unit-tests.sh

@@ -11,9 +11,6 @@ tar -xf build-products-wordpress.tar
 echo "--- :rubygems: Setting up Gems"
 install_gems
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- 🔬 Testing"
 set +e
 bundle exec fastlane test_without_building name:WordPressUnitTests

.buildkite/pipeline.yml

@@ -2,10 +2,10 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#2.15.1
-    - automattic/git-s3-cache#1.1.4:
+    - automattic/a8c-ci-toolkit#2.13.0
+    - automattic/git-s3-cache#v1.1.3:
         bucket: "a8c-repo-mirrors"
-        repo: "automattic/wordpress-ios/"
+        repo: "wordpress-mobile/wordpress-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
     # Be sure to also update the `.xcode-version` file when updating the Xcode image/version here
@@ -90,7 +90,6 @@ steps:
         plugins: *common_plugins
         artifact_paths:
           - "build/results/*"
-          - "build/results/crashes/*"
         notify:
           - github_commit_status:
               context: "UI Tests (iPhone)"
@@ -106,7 +105,6 @@ steps:
         plugins: *common_plugins
         artifact_paths:
           - "build/results/*"
-          - "build/results/crashes/*"
         notify:
           - github_commit_status:
               context: "UI Tests (iPad)"

.buildkite/release-builds.yml

@@ -4,10 +4,10 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#2.15.1
-    - automattic/git-s3-cache#1.1.4:
+    - automattic/a8c-ci-toolkit#2.13.0
+    - automattic/git-s3-cache#v1.1.3:
         bucket: "a8c-repo-mirrors"
-        repo: "automattic/wordpress-ios/"
+        repo: "wordpress-mobile/wordpress-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
     # Be sure to also update the `.xcode-version` file when updating the Xcode image/version here

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,14 +17,3 @@ PR submission checklist:
 - [ ] I have considered adding unit tests for my changes.
 - [ ] I have considered adding accessibility improvements for my changes.
 - [ ] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.
-
-UI Changes testing checklist:
-- [ ] Portrait and landscape orientations.
-- [ ] Light and dark modes.
-- [ ] Fonts: Larger, smaller and bold text.
-- [ ] High contrast.
-- [ ] VoiceOver.
-- [ ] Languages with large words or with letters/accents not frequently used in English.
-- [ ] Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)
-- [ ] iPhone and iPad. 
-- [ ] Multi-tasking: Split view and Slide over. (iPad)

.rubocop.yml

@@ -24,13 +24,6 @@ Layout/LineLength:
 Layout/EmptyLines:
   Exclude: *xfiles
 
-Style/MutableConstant:
-  Exclude:
-    # CocoaPods mutates some input values.
-    # It's simpler to relax this rule than to address each individually by passing mutable copies.
-    - Gutenberg/cocoapods_helpers.rb
-    - Gutenberg/version.rb
-
 Style/AsciiComments:
   Exclude: *xfiles
 

API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/dashboard/dashboard.json

@@ -1,13 +1,13 @@
 {
     "request": {
       "method": "GET",
-      "urlPath": "/wpcom/v2/sites/106707880/dashboard/cards-data/",
+      "urlPath": "/wpcom/v2/sites/181977606/dashboard/cards-data/",
       "queryParameters": {
-        "_locale": {
+        "locale": {
             "matches": "(.*)"
         },
         "cards": {
-            "equalTo": "todays_stats,posts,pages"
+            "equalTo": "todays_stats,posts"
         }
       }
     },
@@ -22,8 +22,8 @@
         },
         "posts": {
             "has_published": true,
-            "draft": [],
-            "scheduled": []
+            "draft": [{}],
+            "scheduled": [{}]
         }
       }
     }

API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/rewind-capabilities.json

@@ -1,9 +1,9 @@
 {
   "request": {
     "method": "GET",
-    "urlPattern": "/wpcom/v2/sites/106707880/rewind/capabilities.*",
+    "urlPattern": "/wpcom/v2/sites/.*/rewind/capabilities.*",
     "queryParameters": {
-      "_locale": {
+      "locale": {
         "matches": "(.*)"
       }
     }