Merge branch 'trunk' into issue/6902-bug-refunds-in-products-list-order-details

Author: toupper

.buildkite/cache-builder.yml

@@ -13,18 +13,22 @@ common_params:
         repo: "woocommerce/woocommerce-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-13.3.1
+    IMAGE_ID: xcode-13.4.1
 
 steps:
 
   #################
   # Build the CocoaPods Base Cache
-  # 
+  #
   # This prevents the base cache from infinite growth caused by storing every
   # version of every pod we've ever used.
   #################
   - label: ":cocoapods: Rebuild CocoaPods cache"
     command: |
+      # Workaround for https://github.com/Automattic/buildkite-ci/issues/79
+      echo "--- :rubygems: Fixing Ruby Setup"
+      gem install bundler
+
       echo "--- :rubygems: Setting up Gems"
       install_gems
 

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

@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
+# Workaround for https://github.com/Automattic/buildkite-ci/issues/79
 echo "--- :rubygems: Fixing Ruby Setup"
 gem install bundler
 

.buildkite/commands/release-build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
+# Workaround for https://github.com/Automattic/buildkite-ci/issues/79
 echo "--- :rubygems: Fixing Ruby Setup"
 gem install bundler
 

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

@@ -6,7 +6,7 @@ IOS_VERSION=$3
 
 echo "Running $TEST_NAME on $DEVICE for iOS $IOS_VERSION"
 
-# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
+# Workaround for https://github.com/Automattic/buildkite-ci/issues/79
 echo "--- :rubygems: Fixing Ruby Setup"
 gem install bundler
 

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

@@ -4,7 +4,7 @@ echo "--- 📦 Downloading Build Artifacts"
 buildkite-agent artifact download build-products.tar .
 tar -xf build-products.tar
 
-# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM
+# Workaround for https://github.com/Automattic/buildkite-ci/issues/79
 echo "--- :rubygems: Fixing Ruby Setup"
 gem install bundler
 

.buildkite/pipeline.yml

@@ -8,7 +8,7 @@ common_params:
         repo: "woocommerce/woocommerce-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-13.3.1
+    IMAGE_ID: xcode-13.4.1
 
 # This is the default pipeline – it will build and test the app
 steps:

.buildkite/release-builds.yml

@@ -10,7 +10,7 @@ common_params:
         repo: "woocommerce/woocommerce-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-13.3.1
+    IMAGE_ID: xcode-13.4.1
 
 steps:
 

CodeGeneration/Package.swift

@@ -1,24 +1,17 @@
-// swift-tools-version:5.3
-// The swift-tools-version declares the minimum version of Swift required to build this package.
+// swift-tools-version:5.5
 
 import PackageDescription
 
 let package = Package(
     name: "Codegen",
     products: [
-        // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
             name: "Codegen",
             type: .dynamic,
             targets: ["Codegen"]),
     ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-    ],
+    dependencies: [],
     targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "Codegen",
             dependencies: []),

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -29,6 +29,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .couponEditing:
             return true
+        case .couponCreation:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .updateOrderOptimistically:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .shippingLabelsOnboardingM1:
@@ -39,6 +41,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .backgroundProductImageUpload:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .appleIDAccountDeletion:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -58,6 +58,10 @@ public enum FeatureFlag: Int {
     ///
     case couponEditing
 
+    /// Displays the option to create a coupon
+    ///
+    case couponCreation
+
     /// Enable optimistic updates for orders
     ///
     case updateOrderOptimistically
@@ -77,4 +81,8 @@ public enum FeatureFlag: Int {
     /// Enable image upload after leaving the product form
     ///
     case backgroundProductImageUpload
+
+    /// Apple ID account deletion
+    ///
+    case appleIDAccountDeletion
 }