Skip to content

Commit 0d69179

Browse files
authored
Fix CI after macOS 12 image deprecation by GitHub. (#430)
* Fix CI after macOS 12 image deprecation by GitHub. * Increase minimum deployment target to iOS 13. * Select Xcode latest stable.
1 parent d3bb693 commit 0d69179

File tree

4 files changed

+28
-24
lines changed

4 files changed

+28
-24
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,31 @@ jobs:
3030
DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3131

3232
test:
33-
runs-on: macos-12
33+
runs-on: macos-14
3434

3535
strategy:
3636
matrix:
3737
platform:
38-
- platform=iOS Simulator,name=iPhone 14 Pro Max
39-
- platform=iOS Simulator,name=iPhone 14 Pro
40-
- platform=iOS Simulator,name=iPhone 14
41-
- platform=iOS Simulator,name=iPhone 14 Plus
42-
- platform=iOS Simulator,name=iPhone 12 Pro Max
43-
- platform=iOS Simulator,name=iPhone 12 Pro
44-
- platform=iOS Simulator,name=iPhone 12
45-
- platform=iOS Simulator,name=iPhone 12 mini
46-
- platform=iOS Simulator,name=iPhone 8 Plus
47-
- platform=iOS Simulator,name=iPhone 8
48-
- platform=iOS Simulator,name=iPhone SE (2nd generation)
38+
- platform=iOS Simulator,name=iPhone 15 Pro Max
39+
- platform=iOS Simulator,name=iPhone 15 Pro
40+
- platform=iOS Simulator,name=iPhone 15
41+
- platform=iOS Simulator,name=iPhone 15 Plus
42+
- platform=iOS Simulator,name=iPhone 16 Pro Max
43+
- platform=iOS Simulator,name=iPhone 16 Pro
44+
- platform=iOS Simulator,name=iPhone 16
45+
- platform=iOS Simulator,name=iPhone 16 Plus
46+
- platform=iOS Simulator,name=iPhone SE (3rd generation)
4947
- platform=tvOS Simulator,name=Apple TV
5048
- platform=tvOS Simulator,name=Apple TV 4K (3rd generation)
51-
- platform=watchOS Simulator,name=Apple Watch Series 8 (45mm)
49+
- platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)
5250

5351
steps:
5452
- uses: actions/checkout@v2
5553

54+
- uses: maxim-lobanov/setup-xcode@v1
55+
with:
56+
xcode-version: latest-stable
57+
5658
- uses: ruby/setup-ruby@v1
5759
with:
5860
bundler-cache: true

DeviceKit.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ Pod::Spec.new do |s|
1313
s.social_media_url = 'https://twitter.com/dennis_weissman'
1414

1515
s.requires_arc = true
16-
s.ios.deployment_target = '11.0'
17-
s.tvos.deployment_target = '11.0'
18-
s.watchos.deployment_target = '4.0'
16+
s.ios.deployment_target = '13.0'
17+
s.tvos.deployment_target = '13.0'
18+
s.watchos.deployment_target = '7.0'
1919

2020
s.swift_version = '5.0'
2121

DeviceKit.xcodeproj/project.pbxproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@
378378
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
379379
INFOPLIST_FILE = Source/Info.plist;
380380
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
381-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
381+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
382382
LD_RUNPATH_SEARCH_PATHS = (
383383
"$(inherited)",
384384
"@executable_path/Frameworks",
@@ -398,7 +398,7 @@
398398
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
399399
SWIFT_VERSION = 5.0;
400400
TARGETED_DEVICE_FAMILY = "1,2,3,4,7";
401-
TVOS_DEPLOYMENT_TARGET = 11.0;
401+
TVOS_DEPLOYMENT_TARGET = 13.0;
402402
VERSIONING_SYSTEM = "apple-generic";
403403
VERSION_INFO_PREFIX = "";
404404
WATCHOS_DEPLOYMENT_TARGET = 4.0;
@@ -438,7 +438,7 @@
438438
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
439439
INFOPLIST_FILE = Source/Info.plist;
440440
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
441-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
441+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
442442
LD_RUNPATH_SEARCH_PATHS = (
443443
"$(inherited)",
444444
"@executable_path/Frameworks",
@@ -456,7 +456,7 @@
456456
SUPPORTS_MACCATALYST = YES;
457457
SWIFT_VERSION = 5.0;
458458
TARGETED_DEVICE_FAMILY = "1,2,3,4,7";
459-
TVOS_DEPLOYMENT_TARGET = 11.0;
459+
TVOS_DEPLOYMENT_TARGET = 13.0;
460460
VALIDATE_PRODUCT = YES;
461461
VERSIONING_SYSTEM = "apple-generic";
462462
VERSION_INFO_PREFIX = "";
@@ -493,7 +493,7 @@
493493
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
494494
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
495495
INFOPLIST_FILE = Tests/Info.plist;
496-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
496+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
497497
LD_RUNPATH_SEARCH_PATHS = (
498498
"$(inherited)",
499499
"@executable_path/Frameworks",
@@ -507,6 +507,7 @@
507507
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
508508
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
509509
SWIFT_VERSION = 5.0;
510+
TVOS_DEPLOYMENT_TARGET = 13.0;
510511
};
511512
name = Debug;
512513
};
@@ -534,7 +535,7 @@
534535
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
535536
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
536537
INFOPLIST_FILE = Tests/Info.plist;
537-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
538+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
538539
LD_RUNPATH_SEARCH_PATHS = (
539540
"$(inherited)",
540541
"@executable_path/Frameworks",
@@ -548,6 +549,7 @@
548549
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
549550
SWIFT_OPTIMIZATION_LEVEL = "-O";
550551
SWIFT_VERSION = 5.0;
552+
TVOS_DEPLOYMENT_TARGET = 13.0;
551553
VALIDATE_PRODUCT = YES;
552554
};
553555
name = Release;

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import PackageDescription
1515
let package = Package(
1616
name: "DeviceKit",
1717
platforms: [
18-
.iOS(.v11),
19-
.tvOS(.v11),
18+
.iOS(.v13),
19+
.tvOS(.v13),
2020
.watchOS(.v4)
2121
],
2222
products: [

0 commit comments

Comments
 (0)