Merge pull request #16509 from wordpress-mobile/merge/17.3-final-into…

…-trunk Merge 17.3 final into trunk
wordpress-mobile · May 17, 2021 · 05c2e8a · 05c2e8a
2 parents e16824b + 774e568
commit 05c2e8a
Show file tree

Hide file tree

Showing 327 changed files with 9,738 additions and 9,163 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -152,7 +152,7 @@ jobs:
                 include_job_number_field: false
                 include_project_field: false
                 failure_message: '${SLACK_FAILURE_MESSAGE}'
-  Installable Build:
+  WordPress Installable Build:
     executor:
       name: ios/default
       <<: *xcode_version
@@ -200,6 +200,7 @@ jobs:
       - run:
           name: Install other tools
           command: |
+            brew update # Update homebrew to temporarily fix a bintray issue
             brew install imagemagick
             brew install ghostscript
             curl -sL https://sentry.io/get-cli/ | bash
@@ -251,6 +252,7 @@ jobs:
       - run:
           name: Install other tools
           command: |
+            brew update # Update homebrew to temporarily fix a bintray issue
             brew install imagemagick
             brew install ghostscript
             curl -sL https://sentry.io/get-cli/ | bash
@@ -268,7 +270,7 @@ jobs:
       - store_artifacts:
           path: Artifacts
           destination: Artifacts
-  jetpack-installable-build:
+  Jetpack Installable Build:
     executor:
       name: ios/default
       <<: *xcode_version
@@ -287,6 +289,7 @@ jobs:
       - run:
           name: Install other tools
           command: |
+            brew update # Update homebrew to temporarily fix a bintray issue
             brew install imagemagick
             brew install ghostscript
             curl -sL https://sentry.io/get-cli/ | bash
@@ -297,7 +300,7 @@ jobs:
       - store_artifacts:
           path: Artifacts
           destination: Artifacts
-  jetpack-pr-build:
+  Build Jetpack:
     executor:
       name: ios/default
       <<: *xcode_version
@@ -316,6 +319,7 @@ jobs:
       - run:
           name: Install other tools
           command: |
+            brew update # Update homebrew to temporarily fix a bintray issue
             brew install imagemagick
             brew install ghostscript
             curl -sL https://sentry.io/get-cli/ | bash
@@ -347,6 +351,7 @@ workflows:
               only:
                 - develop
                 - /^release.*/
+                - /^gutenberg\/integrate_release_.*/
       - UI Tests:
           name: UI Tests (iPad Air 4th generation)
           <<: *ipad_test_device
@@ -357,8 +362,9 @@ workflows:
               only:
                 - develop
                 - /^release.*/
-      - jetpack-installable-build
-      - jetpack-pr-build
+                - /^gutenberg\/integrate_release_.*/
+      - Build Jetpack:
+          name: Build Jetpack (without testing)
       #Optionally run UI tests on PRs
       - Optional Tests:
           type: approval
@@ -368,6 +374,7 @@ workflows:
               ignore:
                 - develop
                 - /^release.*/
+                - /^gutenberg\/integrate_release_.*/
       - UI Tests:
           name: UI Tests (iPhone 11)
           <<: *iphone_test_device
@@ -383,16 +390,27 @@ workflows:
         - not: << pipeline.parameters.beta_build >>
         - not: << pipeline.parameters.release_build >>
     jobs:
-      - Hold:
+      - Approve WordPress:
+          type: approval
+          filters:
+            branches:
+              ignore: /pull\/[0-9]+/
+      - WordPress Installable Build:
+          requires: [Approve WordPress]
+          filters:
+            branches:
+              ignore: /pull\/[0-9]+/
+      - Approve Jetpack:
           type: approval
           filters:
             branches:
               ignore: /pull\/[0-9]+/
-      - Installable Build:
-          requires: [Hold]
+      - Jetpack Installable Build:
+          requires: [Approve Jetpack]
           filters:
             branches:
               ignore: /pull\/[0-9]+/
+
   Release Build:
     when:
       or: [ << pipeline.parameters.beta_build >>, << pipeline.parameters.release_build >> ]
@@ -411,5 +429,4 @@ workflows:
                only:
                  - develop
     jobs:
-      - jetpack-installable-build
-
+      - Jetpack Installable Build
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -76,3 +76,10 @@ custom_rules:
     regex: 'NSLocalizedString\("[^"]*\\\(\S*\)'
     message: "Localized strings must not use interpolated variables. Instead, use `String(format:`"
     severity: error
+
+  swiftui_localization:
+    name: "SwiftUI Localization"
+    regex: 'LocalizedStringKey'
+    message: "Using `LocalizedStringKey` is incompatible with our tooling and doesn't allow you to provide a hint/context comment for translators either. Please use `NSLocalizedString` instead, even with SwiftUI code."
+    severity: error
+    excluded: '.*Widgets/.*'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/wordpress-mobile/release-toolkit
-  revision: 4efe6cd1585db9bbf8f3f0cd889037ceade8de6e
-  tag: 0.15.0
+  revision: eb0f24ec6c73b3454d711cc4b3276c50b9655861
+  tag: 0.18.1
   specs:
-    fastlane-plugin-wpmreleasetoolkit (0.15.0)
+    fastlane-plugin-wpmreleasetoolkit (0.18.1)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       chroma (= 0.2.0)
@@ -21,7 +21,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.3)
-    activesupport (5.2.4.4)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -34,7 +34,7 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.1.1)
-    aws-partitions (1.445.0)
+    aws-partitions (1.455.0)
     aws-sdk-core (3.114.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -43,7 +43,7 @@ GEM
     aws-sdk-kms (1.43.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.93.1)
+    aws-sdk-s3 (1.94.1)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -53,10 +53,10 @@ GEM
     bigdecimal (1.4.4)
     chroma (0.2.0)
     claide (1.0.3)
-    cocoapods (1.10.0)
+    cocoapods (1.10.1)
       addressable (~> 2.6)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.0)
+      cocoapods-core (= 1.10.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -71,7 +71,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.19.0, < 2.0)
-    cocoapods-core (1.10.0)
+    cocoapods-core (1.10.1)
       activesupport (> 5.0, < 6)
       addressable (~> 2.6)
       algoliasearch (~> 1.0)
@@ -93,11 +93,11 @@ GEM
     colored (1.2)
     colored2 (3.1.2)
     colorize (0.8.1)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
-    commonmarker (0.21.0)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    commonmarker (0.21.2)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     declarative (0.0.20)
     diffy (3.4.0)
     digest-crc (0.6.3)
@@ -107,9 +107,9 @@ GEM
     dotenv (2.7.6)
     emoji_regex (3.2.2)
     escape (0.0.4)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    excon (0.80.1)
+    ethon (0.14.0)
+      ffi (>= 1.15.0)
+    excon (0.81.0)
     faraday (1.4.1)
       faraday-excon (~> 1.1)
       faraday-net_http (~> 1.0)
@@ -125,15 +125,15 @@ GEM
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     fastimage (2.2.3)
-    fastlane (2.180.1)
+    fastlane (2.183.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
       colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
+      commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
@@ -142,9 +142,10 @@ GEM
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.37.0, < 0.39.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.1)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
@@ -154,7 +155,6 @@ GEM
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
       tty-screen (>= 0.6.3, < 1.0.0)
@@ -172,20 +172,14 @@ GEM
       trainer
       xcodeproj
       xctest_list (>= 1.2.1)
-    ffi (1.13.1)
+    ffi (1.15.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     git (1.8.1)
       rchardet (~> 1.8)
-    google-api-client (0.38.0)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
-      httpclient (>= 2.8.1, < 3.0)
-      mini_mime (~> 1.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.12)
+    google-apis-androidpublisher_v3 (0.2.0)
+      google-apis-core (~> 0.1)
     google-apis-core (0.3.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.14)
@@ -198,6 +192,8 @@ GEM
       webrick
     google-apis-iamcredentials_v1 (0.3.0)
       google-apis-core (~> 0.1)
+    google-apis-playcustomapp_v1 (0.2.0)
+      google-apis-core (~> 0.1)
     google-apis-storage_v1 (0.3.0)
       google-apis-core (~> 0.1)
     google-cloud-core (1.6.0)
@@ -214,44 +210,44 @@ GEM
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.16.1)
+    googleauth (0.16.2)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
-    highline (1.7.10)
+    highline (2.0.3)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.5.1)
     jsonlint (0.3.0)
       oj (~> 3)
       optimist (~> 3)
-    jwt (2.2.2)
+    jwt (2.2.3)
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.0)
-    mini_portile2 (2.5.0)
-    minitest (5.14.2)
+    mini_portile2 (2.5.1)
+    minitest (5.14.4)
     molinillo (0.6.6)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.11.1)
+    nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    octokit (4.19.0)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.11.2)
+    oj (3.11.5)
     optimist (3.0.1)
     options (2.3.2)
     os (1.1.1)
@@ -274,7 +270,7 @@ GEM
     rexml (3.2.5)
     rmagick (3.2.0)
     rouge (2.0.7)
-    ruby-enum (0.8.0)
+    ruby-enum (0.9.0)
       i18n
     ruby-macho (1.4.0)
     ruby2_keywords (0.0.4)
@@ -291,7 +287,6 @@ GEM
     simctl (1.6.8)
       CFPropertyList
       naturally
-    slack-notifier (2.3.2)
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
@@ -306,7 +301,7 @@ GEM
       tty-cursor (~> 0.7)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.8)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)