Merge pull request #5311 from woocommerce/feat/upgrade-CI-to-Xcode-13

Change Circle CI image to Xcode 13

Author: pmusolino

.circleci/config.yml

@@ -15,15 +15,15 @@ parameters:
     default: false
 
 xcode_version: &xcode_version
-  xcode-version: "12.5.0"
+  xcode-version: "13.0.0"
 
 iphone_test_device: &iphone_test_device
-  device: iPhone 11
-  ios-version: "14.4"
+  device: iPhone 13
+  ios-version: "15.0"
 
 ipad_test_device: &ipad_test_device
   device: iPad Air (4th generation)
-  ios-version: "14.4"
+  ios-version: "15.0"
 
 commands:
   fix-image:
@@ -38,7 +38,7 @@ commands:
               echo "Manually added `/usr/local/bin` to the $PATH:"
               echo $PATH
             fi
-            chruby ruby-2.6.6
+            chruby ruby-$(cat .ruby-version)
             gem install bundler
 
             # Add support for fetching SPM packages from GitHub

.ruby-version

@@ -1 +1 @@
-2.6.4
+2.7.4

.xcversion

@@ -1 +1 @@
-12.5
+13.0

Scripts/build-phases/generate-credentials.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash -euo pipefail
 
+if [[ $ACTION == 'indexbuild' ]]; then
+  echo "ℹ️: Skipping code generation in 'indexbuild' build. See https://github.com/mac-cain13/R.swift/issues/719#issuecomment-937733804 for more info."
+  exit 0
+fi
+
 DERIVED_PATH=${SOURCE_ROOT}/DerivedSources
 SCRIPT_PATH=${SOURCE_ROOT}/Credentials/replace_secrets.rb
 

WooCommerce/Classes/Extensions/UITabBar+Appearance.swift

@@ -15,6 +15,13 @@ extension UITabBar {
         /// To fix it, we have to specifically set it in the `standardAppearance` object.
         ///
         appearance.standardAppearance = createWooTabBarAppearance()
+
+        /// This is needed because the tab bar background has the wrong color under iOS 15 (using Xcode 13).
+        /// More: issue-5018
+        ///
+        if #available(iOS 15.0, *) {
+            appearance.scrollEdgeAppearance = appearance.standardAppearance
+        }
     }
 
     /// Creates an appearance object for a tabbar with the default WC style.

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/AttributedText.swift

@@ -197,13 +197,13 @@ extension EnvironmentValues {
 
 private extension EnvironmentValues {
     var foregroundColor: Color? {
-        get { self[ForegroundColorKey] }
-        set { self[ForegroundColorKey] = newValue }
+        get { self[ForegroundColorKey.self] }
+        set { self[ForegroundColorKey.self] = newValue }
     }
 
     var linkColor: Color? {
-        get { self[LinkColorKey] }
-        set { self[LinkColorKey] = newValue }
+        get { self[LinkColorKey.self] }
+        set { self[LinkColorKey.self] = newValue }
     }
 }