Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump deployment target to iOS 15 #81

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump deployment target to iOS 15 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c31d47
Bump deployment target to iOS 15
NickEntin Oct 5, 2024
38f3734
Replace use of deprecated API
NickEntin Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Example/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use_frameworks!

platform :ios, '12.0'
platform :ios, '15.0'

target 'Stagehand_Example' do
pod 'Stagehand', :path => '../'
Expand Down
6 changes: 3 additions & 3 deletions Example/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 6 additions & 4 deletions Example/Stagehand.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.6 not .0?

LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand All @@ -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";
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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)";
Expand All @@ -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)";
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import PackageDescription
let package = Package(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We likely want to change the swift tools version to 6.0 at the top of the file, and remove the stray let version line at the bottom of this file

name: "Stagehand",
platforms: [
.iOS(.v12),
.iOS(.v15),
.macOS(.v11),
],
products: [
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want the swift version of this repo to be 5 or 6? I know we want to support SPM v6, but what language mode do we want for this repo? Are we ready for 6? Or is there more work to do first?

Expand Down
3 changes: 2 additions & 1 deletion Sources/StagehandTesting/Core/AnimationSnapshotting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import Foundation
import MobileCoreServices
import UIKit
import UniformTypeIdentifiers

@testable import Stagehand

Expand Down Expand Up @@ -159,7 +160,7 @@ public enum AnimationSnapshotting {

guard let destination = CGImageDestinationCreateWithURL(
url as CFURL,
kUTTypePNG,
UTType.png.identifier as CFString,
images.count,
nil
) else {
Expand Down
2 changes: 1 addition & 1 deletion Stagehand.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be 5.10 or 6.0


Expand Down
2 changes: 1 addition & 1 deletion StagehandTesting.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We likely want 5.10 or 6.0 here


Expand Down