[DO NOT MERGE] Introduce swift version testing using steps

.buildkite/pipeline.yml

@@ -6,7 +6,21 @@
 agents:
   queue: "mac"
 env:
-  IMAGE_ID: $IMAGE_ID
+  IMAGE_ID: $SWIFT_6_0_IMAGE_ID
+
+##################
+# Reusabled Blocks
+##################
+validate_pods: &validate_pods
+  command: |
+    .buildkite/commands/validate-pods.sh
+  plugins: [$CI_TOOLKIT]
+
+demo_build: &demo_build
+  plugins: [$CI_TOOLKIT]
+  command: |
+    install_gems
+    BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER make build-demo-for-distribution
 
 steps:
   #################
@@ -31,20 +45,39 @@ steps:
   #################
   # Build and Test
   #################
-  - label: "📦 Build and Test Swift Package"
-    key: "test"
-    command: |
-      validate_swift_package
-    plugins: [$CI_TOOLKIT]
+  - group: "📦 Build and Test Swift Package"
+    steps:
+      - label: "📦 Build and Test Swift Package (Swift $SWIFT_6_0_VERSION)"
+        command: |
+          validate_swift_package test device_model:"$SWIFT_6_0_DEVICE" os:"$SWIFT_6_0_OS"
+        key: "test_swift_current"
+        env:
+          IMAGE_ID: "$SWIFT_6_0_IMAGE_ID"
+        plugins: [$CI_TOOLKIT]
+
+      - label: "📦 Build and Test Swift Package (Swift $SWIFT_5_10_VERSION)"
+        command: |
+          validate_swift_package test device_model:"$SWIFT_5_10_DEVICE" os:"$SWIFT_5_10_OS"
+        key: "test_swift_5_10"
+        env:
+          IMAGE_ID: "$SWIFT_5_10_IMAGE_ID"
+        plugins: [$CI_TOOLKIT]
 
   ###################
   # Validate Podspec
   ###################
-  - label: "🔬 Validate Podspecs"
-    key: "validate"
-    command: |
-      .buildkite/commands/validate-pods.sh
-    plugins: [$CI_TOOLKIT]
+  - group: "🔬 Validate Podspecs"
+    steps:
+      - <<: *validate_pods
+        label: "🔬 Validate Podspecs (Swift $SWIFT_6_0_VERSION)"
+        key: "validate"
+        env:
+          IMAGE_ID: "$SWIFT_6_0_IMAGE_ID"
+
+      - <<: *validate_pods
+        label: "🔬 Validate Podspecs (Swift $SWIFT_5_10_VERSION)"
+        env:
+          IMAGE_ID: "$SWIFT_5_10_IMAGE_ID"
 
   #######################
   # Publish the Podspecs (if we're building a tag)
@@ -56,24 +89,24 @@ steps:
       .buildkite/commands/publish-pod.sh "GravatarUI.podspec"
     plugins: [$CI_TOOLKIT]
     depends_on:
-      - "test"
+      - "test_swift_current"
       - "validate"
       - "lint"
     if: build.tag != null
 
   ###################
   # Prototype Builds of Demo Projects
   ###################
-  - group: ":appcenter: Prototype Builds"
+  - group: "🛠️ Build SwiftUI Demo"
     steps:
-      - label: "🛠️ Build Demo"
+      ###################
+      # Build/Upload Demo
+      ###################
+      - <<: *demo_build
+        label: "🛠️ Build Demo (Swift $SWIFT_6_0_VERSION)"
         key: build_demo
-        depends_on: test
-        plugins: [$CI_TOOLKIT]
-        command: |
-          install_gems
-          BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER make build-demo-for-distribution
-        artifact_paths:
+        depends_on: test_swift_current
+        artifact_paths: # Archive artifacts only for the production version of Swift
           - ".build/artifacts/*.ipa"
           - ".build/artifacts/*.dSYM.zip"
 
@@ -82,3 +115,13 @@ steps:
         plugins: [$CI_TOOLKIT]
         command: .buildkite/commands/upload-to-appcenter.sh
         if: build.pull_request.id != null
+
+      ###################
+      # Build Demo Distribution for older supported versions of Swift
+      ###################
+      - <<: *demo_build
+        label: "🛠️ Build Demo (Swift $SWIFT_5_10_VERSION)"
+        key: build_swift_5_10
+        depends_on: test_swift_5_10
+        env:
+          IMAGE_ID: "$SWIFT_5_10_IMAGE_ID"

.buildkite/shared-pipeline-vars

@@ -3,6 +3,17 @@
 # This file is `source`'d before calling `buildkite-agent pipeline upload`, and can be used
 # to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
 
-export IMAGE_ID="xcode-16.2-macos-14.7.1-v1"
-
 export CI_TOOLKIT="automattic/a8c-ci-toolkit#3.2.2"
+
+## Supported versions of Swift
+# Swift 6.0
+export SWIFT_6_0_IMAGE_ID="xcode-16.2-macos-14.7.1-v1"
+export SWIFT_6_0_VERSION="6_0"  # Use `_` instead of `.` since these are used in labels
+export SWIFT_6_0_DEVICE="default"  # Use the default value in Fastlane
+export SWIFT_6_0_OS="18.2"
+
+# Swift 5.10
+export SWIFT_5_10_IMAGE_ID="xcode-15.4"
+export SWIFT_5_10_VERSION="5_10"  # Use `_` instead of `.` since these are used in labels
+export SWIFT_5_10_DEVICE="default"  # Use the default value in Fastlane
+export SWIFT_5_10_OS="17.5"

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

Sources/GravatarUI/Base/AssociatedObject.swift

@@ -2,9 +2,11 @@ import Foundation
 
 func getAssociatedObject<T>(_ object: Any, _ key: UnsafeRawPointer) -> T? {
     if #available(iOS 14, *) { // swift 5.3 fixed this issue (https://github.com/apple/swift/issues/46456)
-        objc_getAssociatedObject(object, key) as? T
+        // swiftformat:disable:next --redundantReturn
+        return objc_getAssociatedObject(object, key) as? T
     } else {
-        objc_getAssociatedObject(object, key) as AnyObject as? T
+        // swiftformat:disable:next --redundantReturn
+        return objc_getAssociatedObject(object, key) as AnyObject as? T
     }
 }
 

fastlane/Fastfile

@@ -3,7 +3,8 @@
 default_platform(:ios)
 
 OS = '18.2'
-IPHONE_DEVICE = "iPhone SE (3rd generation) (#{OS})".freeze
+IPHONE_MODEL = 'iPhone SE (3rd generation)'
+IPHONE_DEVICE = "#{IPHONE_MODEL} (#{OS})".freeze
 
 PROJECT_ROOT_FOLDER = File.join(File.dirname(File.expand_path(__dir__)), 'Demo')
 BUILD_FOLDER = File.join(__dir__, '.build')
@@ -49,12 +50,15 @@ end
 
 platform :ios do
   desc 'Builds the project and runs tests'
-  lane :test do
+  lane :test do |device_model: 'default', os: 'default'|
+    device_model = IPHONE_MODEL if device_model == 'default'
+    os = OS if os == 'default'
+
     run_tests(
       package_path: '.',
       scheme: 'Gravatar-Package',
       xcargs: COMMON_XCARGS,
-      device: IPHONE_DEVICE,
+      device: "#{device_model} (#{os})",
       prelaunch_simulator: true,
       clean: true,
       buildlog_path: LOGS_FOLDER,