Skip to content

Commit 819dea2

Browse files
fix: Add missing package transient dependencies (#300)
* Update [email protected] Add missing transient dependencies * wip * Change Xcode version to 16.4 in CI workflow Updated Xcode version in CI workflow from 16.2 to 16.4. * wip --------- Co-authored-by: Stephen Celis <[email protected]>
1 parent 57734af commit 819dea2

File tree

4 files changed

+22
-12
lines changed

4 files changed

+22
-12
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
xcode:
22-
- '16.2'
22+
- '16.4'
2323
variation:
2424
- ios
2525
- macos
@@ -42,7 +42,7 @@ jobs:
4242
# strategy:
4343
# matrix:
4444
# xcode:
45-
# - '16.2'
45+
# - '16.4'
4646
# steps:
4747
# - uses: actions/checkout@v4
4848
# - name: Select Xcode ${{ matrix.xcode }}

Makefile

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
IOS_VERSION = 18.2
2-
TVOS_VERSION = 18.2
3-
WATCHOS_VERSION = 11.2
1+
IOS_VERSION = 18.5
2+
TVOS_VERSION = 18.5
3+
WATCHOS_VERSION = 11.5
44
OTHER_SWIFT_FLAGS="-DRESILIENT_LIBRARIES"
55
PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS $(IOS_VERSION),iPhone \d\+ Pro [^M])
66
PLATFORM_MACOS = macOS
@@ -13,7 +13,7 @@ default: test
1313

1414
test: test-ios test-macos test-tvos test-watchos test-examples
1515

16-
test-ios:
16+
test-ios: warm-simulator
1717
xcodebuild test \
1818
-workspace SwiftNavigation.xcworkspace \
1919
-scheme SwiftNavigation \
@@ -22,7 +22,7 @@ test-ios:
2222
-workspace SwiftNavigation.xcworkspace \
2323
-scheme DynamicFramework \
2424
-destination platform="$(PLATFORM_IOS)"
25-
test-macos:
25+
test-macos: warm-simulator
2626
xcodebuild test \
2727
-workspace SwiftNavigation.xcworkspace \
2828
-scheme SwiftNavigation \
@@ -31,7 +31,7 @@ test-macos:
3131
-workspace SwiftNavigation.xcworkspace \
3232
-scheme DynamicFramework \
3333
-destination platform="$(PLATFORM_MACOS)"
34-
test-tvos:
34+
test-tvos: warm-simulator
3535
xcodebuild test \
3636
-workspace SwiftNavigation.xcworkspace \
3737
-scheme SwiftNavigation \
@@ -40,7 +40,7 @@ test-tvos:
4040
-workspace SwiftNavigation.xcworkspace \
4141
-scheme DynamicFramework \
4242
-destination platform="$(PLATFORM_TVOS)"
43-
test-watchos:
43+
test-watchos: warm-simulator
4444
xcodebuild test \
4545
-workspace SwiftNavigation.xcworkspace \
4646
-scheme SwiftNavigation \
@@ -50,13 +50,13 @@ test-watchos:
5050
-scheme DynamicFramework \
5151
-destination platform="$(PLATFORM_WATCHOS)"
5252

53-
test-examples:
53+
test-examples: warm-simulator
5454
xcodebuild test \
5555
-workspace SwiftNavigation.xcworkspace \
5656
-scheme CaseStudies \
5757
-destination platform="$(PLATFORM_IOS)"
5858

59-
build-for-library-evolution:
59+
build-for-library-evolution: warm-simulator
6060
swift build \
6161
-c release \
6262
-Xswiftc -emit-module-interface \
@@ -90,7 +90,13 @@ format:
9090
--recursive \
9191
./Examples ./Package.swift ./Sources ./Tests
9292

93-
.PHONY: format test-all test-docs
93+
warm-simulator:
94+
@test "$(PLATFORM_IOS)" != "" \
95+
&& xcrun simctl boot $(PLATFORM_ID) \
96+
&& open -a Simulator --args -CurrentDeviceUDID $(PLATFORM_IOS) \
97+
|| exit 0
98+
99+
.PHONY: format test-all test-docs warm-simulator
94100

95101
define udid_for
96102
$(shell xcrun simctl list devices available '$(1)' | grep '$(2)' | sort -r | head -1 | awk -F '[()]' '{ print $$(NF-3) }')

Package.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ let package = Package(
4444
.product(name: "CasePaths", package: "swift-case-paths"),
4545
.product(name: "CustomDump", package: "swift-custom-dump"),
4646
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
47+
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
4748
.product(name: "OrderedCollections", package: "swift-collections"),
4849
.product(name: "Perception", package: "swift-perception"),
4950
]
@@ -74,6 +75,7 @@ let package = Package(
7475
"SwiftNavigation",
7576
"UIKitNavigationShim",
7677
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
78+
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
7779
]
7880
),
7981
.target(

[email protected]

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ let package = Package(
4444
.product(name: "CasePaths", package: "swift-case-paths"),
4545
.product(name: "CustomDump", package: "swift-custom-dump"),
4646
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
47+
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
4748
.product(name: "OrderedCollections", package: "swift-collections"),
4849
.product(name: "Perception", package: "swift-perception"),
4950
]
@@ -74,6 +75,7 @@ let package = Package(
7475
"SwiftNavigation",
7576
"UIKitNavigationShim",
7677
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
78+
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
7779
]
7880
),
7981
.target(

0 commit comments

Comments
 (0)