Skip to content

Commit 464f03b

Browse files
davdromandavdroman
authored
Remove SimulatorStatusMagic (#411)
1 parent 0cd2a5a commit 464f03b

File tree

4 files changed

+40
-62
lines changed

4 files changed

+40
-62
lines changed

‎.github/workflows/ci.yml

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches:
99
- "**"
1010
schedule:
11-
- cron: '3 3 * * 2' # 3:03 AM, every Tuesday
11+
- cron: "3 3 * * 2" # 3:03 AM, every Tuesday
1212

1313
concurrency:
1414
group: ci-${{ github.ref }}
@@ -44,8 +44,8 @@ jobs:
4444
install: true
4545
- platform: [iOS, 14]
4646
runtime: iOS 14.5
47-
os: macos-13
48-
xcode: 14.3.1
47+
os: macos-12
48+
xcode: 14.2
4949
install: true
5050
- platform: [iOS, 15]
5151
runtime: iOS 15.5
@@ -57,9 +57,9 @@ jobs:
5757
os: macos-13
5858
xcode: 14.3.1
5959
- platform: [iOS, 17]
60-
runtime: iOS 17.0
61-
os: macos-13
62-
xcode: 15.0.1
60+
runtime: iOS 17.5
61+
os: macos-14
62+
xcode: 15.4
6363

6464
- platform: [tvOS, 13]
6565
runtime: tvOS 13.4
@@ -68,8 +68,8 @@ jobs:
6868
install: true
6969
- platform: [tvOS, 14]
7070
runtime: tvOS 14.5
71-
os: macos-13
72-
xcode: 14.3.1
71+
os: macos-12
72+
xcode: 14.2
7373
install: true
7474
- platform: [tvOS, 15]
7575
runtime: tvOS 15.4
@@ -81,15 +81,10 @@ jobs:
8181
os: macos-13
8282
xcode: 15.0.1
8383
- platform: [tvOS, 17]
84-
runtime: tvOS 17.0
85-
os: macos-13
86-
xcode: 15.0.1
84+
runtime: tvOS 17.5
85+
os: macos-14
86+
xcode: 15.4
8787

88-
- platform: [watchOS, 7]
89-
runtime: watchOS 7.4
90-
os: macos-13
91-
xcode: 14.3.1
92-
install: true
9388
- platform: [watchOS, 8]
9489
runtime: watchOS 8.5
9590
os: macos-13
@@ -100,9 +95,9 @@ jobs:
10095
os: macos-13
10196
xcode: 14.3.1
10297
- platform: [watchOS, 10]
103-
runtime: watchOS 10.0
104-
os: macos-13
105-
xcode: 15.0.1
98+
runtime: watchOS 10.5
99+
os: macos-14
100+
xcode: 15.4
106101

107102
- platform: [macOS, 12]
108103
runtime: macOS 12
@@ -112,13 +107,15 @@ jobs:
112107
runtime: macOS 13
113108
os: macos-13
114109
xcode: 15.0.1
115-
116-
# FIXME: this currently hangs on CI
117-
# - platform: [visionos, 1]
118-
# runtime: visionOS 1.0-beta2
119-
# os: macos-13
120-
# xcode: 15.0
121-
# install: true
110+
# - platform: [macOS, 14]
111+
# runtime: macOS 14
112+
# os: macos-14
113+
# xcode: 15.4
114+
115+
# - platform: [visionOS, 1]
116+
# runtime: visionOS 1.2
117+
# os: macos-14
118+
# xcode: 15.4
122119
steps:
123120
- name: Git Checkout
124121
uses: actions/checkout@v4
@@ -131,9 +128,18 @@ jobs:
131128
- name: Set environment variables
132129
run: echo "SKIP_SLOW_FASTLANE_WARNING=1" >> $GITHUB_ENV
133130

131+
- if: ${{ matrix.platform[0] == 'visionOS' }}
132+
run: |
133+
defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES
134+
defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES
135+
134136
- name: Select Xcode version
135137
run: sudo xcodes select ${{ matrix.xcode }}
136138

139+
- if: ${{ matrix.install }}
140+
name: "[Debug] List Available Installable Runtimes"
141+
run: xcodes runtimes --include-betas
142+
137143
- if: ${{ matrix.install }}
138144
name: Install Required Runtime (${{ matrix.runtime }})
139145
uses: nick-fields/retry@v2
@@ -142,8 +148,7 @@ jobs:
142148
max_attempts: 3
143149
command: sudo xcodes runtimes install '${{ matrix.runtime }}'
144150

145-
- if: false
146-
name: '[Debug] List Available Runtimes, Simulators, and Destinations'
151+
- name: "[Debug] List Available Runtimes, Simulators, and Destinations"
147152
run: |
148153
xcrun simctl list
149154
xcodebuild -scheme "SwiftUIIntrospect" -showdestinations
@@ -160,6 +165,6 @@ jobs:
160165
name: Run Tests
161166
run: fastlane test platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:SwiftUIIntrospectTests configuration:Debug
162167

163-
- if: ${{ matrix.platform[0] == 'iOS' && matrix.platform[1] <= '16' }}
164-
name: Run UI Tests
165-
run: fastlane test platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:SwiftUIIntrospectUITests configuration:Debug
168+
# - if: ${{ matrix.platform[0] == 'iOS' && matrix.platform[1] <= '16' }}
169+
# name: Run UI Tests
170+
# run: fastlane test platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:SwiftUIIntrospectUITests configuration:Debug

‎SwiftUIIntrospect.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tests/Tests.xcodeproj/project.pbxproj

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
D5C482402AA354B0005FBE0A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D5C4823F2AA354B0005FBE0A /* LaunchScreen.storyboard */; platformFilter = ios; };
130130
D5F0BE4D29C0DBE800AD95AB /* TestsHostApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F0BE4C29C0DBE800AD95AB /* TestsHostApp.swift */; };
131131
D5F0BE6A29C0DC4900AD95AB /* PlatformVersionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F0BE6729C0DC4900AD95AB /* PlatformVersionTests.swift */; };
132-
D5F210812A66DDCB002B8385 /* SimulatorStatusMagic in Frameworks */ = {isa = PBXBuildFile; productRef = D5F210802A66DDCB002B8385 /* SimulatorStatusMagic */; };
133132
D5F26E022A561130001209E6 /* PageControlTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F26E012A561130001209E6 /* PageControlTests.swift */; };
134133
D5F26E042A56E74B001209E6 /* ViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F26E032A56E74B001209E6 /* ViewControllerTests.swift */; };
135134
D5F8D5ED2A1E7B490054E9AB /* NavigationViewWithStackStyleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F8D5EC2A1E7B490054E9AB /* NavigationViewWithStackStyleTests.swift */; };
@@ -259,7 +258,6 @@
259258
isa = PBXFrameworksBuildPhase;
260259
buildActionMask = 2147483647;
261260
files = (
262-
D5F210812A66DDCB002B8385 /* SimulatorStatusMagic in Frameworks */,
263261
D58D83382A66C01300A203BE /* SnapshotTesting in Frameworks */,
264262
D58D833A2A66C04600A203BE /* SwiftUIIntrospect in Frameworks */,
265263
);
@@ -526,7 +524,6 @@
526524
packageProductDependencies = (
527525
D58D83372A66C01300A203BE /* SnapshotTesting */,
528526
D58D83392A66C04600A203BE /* SwiftUIIntrospect */,
529-
D5F210802A66DDCB002B8385 /* SimulatorStatusMagic */,
530527
);
531528
productName = UITests;
532529
productReference = D58D832B2A66BDD500A203BE /* UITests.xctest */;
@@ -631,7 +628,6 @@
631628
mainGroup = D5F0BE3E29C0DB9700AD95AB;
632629
packageReferences = (
633630
D58D83362A66C01300A203BE /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
634-
D5F2107D2A66DC85002B8385 /* XCRemoteSwiftPackageReference "SimulatorStatusMagic" */,
635631
);
636632
productRefGroup = D5F0BE4A29C0DBE800AD95AB /* Products */;
637633
projectDirPath = "";
@@ -2023,14 +2019,6 @@
20232019
minimumVersion = 1.11.1;
20242020
};
20252021
};
2026-
D5F2107D2A66DC85002B8385 /* XCRemoteSwiftPackageReference "SimulatorStatusMagic" */ = {
2027-
isa = XCRemoteSwiftPackageReference;
2028-
repositoryURL = "https://github.com/shinydevelopment/SimulatorStatusMagic";
2029-
requirement = {
2030-
kind = upToNextMajorVersion;
2031-
minimumVersion = 2.7.0;
2032-
};
2033-
};
20342022
/* End XCRemoteSwiftPackageReference section */
20352023

20362024
/* Begin XCSwiftPackageProductDependency section */
@@ -2055,11 +2043,6 @@
20552043
isa = XCSwiftPackageProductDependency;
20562044
productName = SwiftUIIntrospect;
20572045
};
2058-
D5F210802A66DDCB002B8385 /* SimulatorStatusMagic */ = {
2059-
isa = XCSwiftPackageProductDependency;
2060-
package = D5F2107D2A66DC85002B8385 /* XCRemoteSwiftPackageReference "SimulatorStatusMagic" */;
2061-
productName = SimulatorStatusMagic;
2062-
};
20632046
/* End XCSwiftPackageProductDependency section */
20642047
};
20652048
rootObject = D5F0BE3F29C0DB9700AD95AB /* Project object */;

‎fastlane/Fastfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,22 @@ devices = {
66
14 => ["iPhone 12 (14.5)", "iPad Pro (9.7-inch) (14.5)"],
77
15 => ["iPhone SE (3rd generation) (15.5)", "iPad Air (5th generation) (15.5)",],
88
16 => ["iPhone 14 (16.4)", "iPad Pro (11-inch) (4th generation) (16.4)"],
9-
17 => ["iPhone 14 (17.0.1)", "iPad Pro (11-inch) (4th generation) (17.0.1)"],
9+
17 => ["iPhone 14 (17.5)", "iPad Pro (11-inch) (4th generation) (17.5)"],
1010
},
1111
"tvos" => {
1212
13 => ["Apple TV (13.4)"],
1313
14 => ["Apple TV (14.5)"],
1414
15 => ["Apple TV (15.4)"],
1515
16 => ["Apple TV (16.4)"],
16-
17 => ["Apple TV (17.0)"],
16+
17 => ["Apple TV (17.5)"],
1717
},
1818
"watchos" => {
19-
7 => ["Apple Watch Series 6 (44mm) (7.4)"],
2019
8 => ["Apple Watch Series 7 (45mm) (8.5)"],
2120
9 => ["Apple Watch Series 8 (45mm) (9.4)"],
22-
10 => ["Apple Watch Series 9 (45mm) (10.0)"],
21+
10 => ["Apple Watch Series 9 (45mm) (10.5)"],
2322
},
2423
"visionos" => {
25-
1 => ["Apple Vision Pro (1.0)"],
24+
1 => ["Apple Vision Pro (1.2)"],
2625
},
2726
}
2827

0 commit comments

Comments
 (0)