Skip to content

chore: remove unused pinned dependency #252

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

Merged
merged 7 commits into from
Oct 4, 2025
Merged

chore: remove unused pinned dependency #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de8fe55
chore: remove unused pinned dependency
rhwood Sep 23, 2025
c6dbe86
chore: update CI devices
rhwood Sep 24, 2025
330cb19
chore: update CI devices (part 2)
rhwood Sep 24, 2025
56f271a
allow minor variation in tests
rhwood Sep 25, 2025
3f58346
Catalyst behaves like macOS in Xcode 16
rhwood Sep 25, 2025
07f2660
skip testDotSize in macCatalyst
rhwood Oct 4, 2025
bb0a65f
specify OS version
rhwood Oct 4, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/swift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
destination: [
"'platform=macOS,variant=Mac Catalyst'",
"'platform=macOS'",
"'platform=tvOS Simulator,name=Apple TV'",
"'platform=iOS Simulator,name=iPhone 8'",
"'platform=watchOS Simulator,name=Apple Watch Series 5 (40mm)'"
"'platform=tvOS Simulator,name=Apple TV,OS=26.0'",
"'platform=iOS Simulator,name=iPhone 16,OS=26.0'",
"'platform=watchOS Simulator,name=Apple Watch SE (40mm) (2nd generation),OS=26.0'"
]
runs-on: macos-latest

Expand Down
9 changes: 0 additions & 9 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions Tests/WMATAUITests/LineUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ final class LinesUITests: XCTestCase {
let dot = Line.red.dot(style: .headline, factor: 1.0)
#if targetEnvironment(macCatalyst) // macCatalyst builds as if iOS without this target environment
let baseFontSize = 19.0
let largeFontSize = 55.0
let largeFontSize = 19.0
try XCTSkipIf(true, "showView has empty implementaton in macCatalyst")
#elseif os(macOS)
let baseFontSize = 15.0
let largeFontSize = 15.0
Expand Down Expand Up @@ -77,7 +78,9 @@ final class LinesUITests: XCTestCase {
dot
.environment(\.sizeCategory, .accessibilityExtraExtraExtraLarge)
.readSize { size in
XCTAssertEqual(size.height, largeFontSize)
// rounding up expanded sizes instead of dealing with 1/3 pt differences
// between target size and rendered size
XCTAssertEqual(size.height.rounded(.up), largeFontSize)
largeSizeExpectation.fulfill()
}
)
Expand Down Expand Up @@ -119,11 +122,14 @@ extension View {
}

func showView<T: View>(_ view: T) {
#if os(macOS)
#if targetEnvironment(macCatalyst)
// do nothing
#elseif os(macOS)
let window = NSWindow()
window.contentViewController = NSHostingController(rootView: view)
window.makeKeyAndOrderFront(nil)
#elseif os(watchOS)
// do nothing
#else
let window = UIWindow(frame: UIScreen.main.bounds)
window.rootViewController = UIHostingController(rootView: view)
Expand Down