From 0c31d47c1cef28f152edf07f14148f3515f4df0d Mon Sep 17 00:00:00 2001 From: Nick Entin Date: Fri, 4 Oct 2024 22:12:55 -0700 Subject: [PATCH 1/2] Bump deployment target to iOS 15 --- .github/workflows/ci.yml | 14 ++++++-------- Example/Podfile | 2 +- Example/Podfile.lock | 6 +++--- Example/Stagehand.xcodeproj/project.pbxproj | 10 ++++++---- Package.swift | 2 +- Stagehand.podspec | 2 +- StagehandTesting.podspec | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1940e5d..f423686 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: jobs: pod-lint: name: Pod Lint - runs-on: macos-latest + runs-on: macos-15 steps: - name: Checkout Repo uses: actions/checkout@v4 @@ -19,7 +19,7 @@ jobs: run: bundle exec --gemfile=Example/Gemfile pod lib lint --verbose --fail-fast --include-podspecs=Stagehand.podspec StagehandTesting.podspec spm: name: SPM Build - runs-on: macos-latest + runs-on: macos-15 strategy: fail-fast: false steps: @@ -28,16 +28,14 @@ jobs: - name: Build run: | # select minimum supported Xcode version - sudo xcode-select -s /Applications/Xcode_14.3.1.app - # TODO: add SPM test target, for now just run build on all products. + sudo xcode-select -s /Applications/Xcode_16.app xcodebuild build \ -scheme Stagehand-Package \ - -sdk iphonesimulator16.4 \ - -destination "OS=16.4,name=iPhone 13 Pro" - + -sdk iphonesimulator18.0 \ + -destination "OS=18.0,name=iPhone 16 Pro" xcode-build: name: Xcode Build - runs-on: macOS-14 + runs-on: macOS-15 strategy: fail-fast: false steps: diff --git a/Example/Podfile b/Example/Podfile index 05eab3d..2cfc510 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,6 +1,6 @@ use_frameworks! -platform :ios, '12.0' +platform :ios, '15.0' target 'Stagehand_Example' do pod 'Stagehand', :path => '../' diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 2053b57..3eed5e7 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -33,9 +33,9 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: iOSSnapshotTestCase: 9ab44cb5aa62b84d31847f40680112e15ec579a6 SnapshotTesting: 273b614fcc60fac7d9f613f6648afa91a7da36be - Stagehand: 29ee26a0690ebf90a5ea45e86fd88b865baf5403 - StagehandTesting: 3354a5300e7fc6d1ba9ab182762feff9e80cb6de + Stagehand: a41e2de66cfc9f3c7641d2b0f48e715bf9e3d70c + StagehandTesting: dc5cce5413593eb609bc2bbaaad4462177f844d7 -PODFILE CHECKSUM: b4841bd82e57283ff97d83f4bb89137cc01f6102 +PODFILE CHECKSUM: 0ab4bd8f2e32d2f3bff768d3c17af0d203a15b94 COCOAPODS: 1.14.3 diff --git a/Example/Stagehand.xcodeproj/project.pbxproj b/Example/Stagehand.xcodeproj/project.pbxproj index a6af047..4ccbbb4 100644 --- a/Example/Stagehand.xcodeproj/project.pbxproj +++ b/Example/Stagehand.xcodeproj/project.pbxproj @@ -719,7 +719,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Performance Tests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -746,7 +746,7 @@ CODE_SIGN_STYLE = Automatic; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Performance Tests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.squareup.Stagehand-PerformanceTests"; @@ -869,7 +869,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = 6385SJ58J2; INFOPLIST_FILE = Stagehand/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = com.squareup.StagehandDemo; @@ -885,7 +885,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = 6385SJ58J2; INFOPLIST_FILE = Stagehand/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = com.squareup.StagehandDemo; @@ -908,6 +908,7 @@ "$(inherited)", ); INFOPLIST_FILE = "Unit Tests/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -926,6 +927,7 @@ "$(inherited)", ); INFOPLIST_FILE = "Unit Tests/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Package.swift b/Package.swift index 3351723..3640a9c 100644 --- a/Package.swift +++ b/Package.swift @@ -21,7 +21,7 @@ import PackageDescription let package = Package( name: "Stagehand", platforms: [ - .iOS(.v12), + .iOS(.v15), .macOS(.v11), ], products: [ diff --git a/Stagehand.podspec b/Stagehand.podspec index 19cc212..8a6f81b 100644 --- a/Stagehand.podspec +++ b/Stagehand.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| s.author = 'Square' s.source = { :git => 'https://github.com/CashApp/Stagehand.git', :tag => s.version.to_s } - s.ios.deployment_target = '12.0' + s.ios.deployment_target = '15.0' s.swift_version = '5.0.1' diff --git a/StagehandTesting.podspec b/StagehandTesting.podspec index 1d01015..316b079 100644 --- a/StagehandTesting.podspec +++ b/StagehandTesting.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| s.author = 'Square' s.source = { :git => 'https://github.com/CashApp/Stagehand.git', :tag => s.version.to_s } - s.ios.deployment_target = '12.0' + s.ios.deployment_target = '15.0' s.swift_version = '5.0.1' From 38f3734c3bad1d1a21df88a4070012b02a07926b Mon Sep 17 00:00:00 2001 From: Nick Entin Date: Fri, 4 Oct 2024 22:16:38 -0700 Subject: [PATCH 2/2] Replace use of deprecated API --- Sources/StagehandTesting/Core/AnimationSnapshotting.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/StagehandTesting/Core/AnimationSnapshotting.swift b/Sources/StagehandTesting/Core/AnimationSnapshotting.swift index a8ee1cc..55ad8e5 100644 --- a/Sources/StagehandTesting/Core/AnimationSnapshotting.swift +++ b/Sources/StagehandTesting/Core/AnimationSnapshotting.swift @@ -17,6 +17,7 @@ import Foundation import MobileCoreServices import UIKit +import UniformTypeIdentifiers @testable import Stagehand @@ -159,7 +160,7 @@ public enum AnimationSnapshotting { guard let destination = CGImageDestinationCreateWithURL( url as CFURL, - kUTTypePNG, + UTType.png.identifier as CFString, images.count, nil ) else {