From af92455a0fba77682948a5da293598b94a21d08e Mon Sep 17 00:00:00 2001 From: Cal Stephens Date: Thu, 29 Jun 2023 12:50:07 -0700 Subject: [PATCH] Clean up --- .github/workflows/main.yml | 3 ++- CHANGELOG.md | 2 +- Sources/EpoxyCore/SwiftUI/UIView+SwiftUIView.swift | 2 +- Sources/EpoxyCore/Views/ViewType.swift | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35a36927..9c35d333 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,8 @@ jobs: strategy: matrix: xcode: - - '14.3.1' # Swift 5.8 + - '13.2.1' # Swift 5.5 (lowest) + - '14.0.1' # Swift 5.7 (highest) steps: - uses: actions/checkout@v2 - uses: ./.github/actions/setup diff --git a/CHANGELOG.md b/CHANGELOG.md index a71ddc7d..e14c0f37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - ... -## [0.10.0](https://github.com/airbnb/epoxy-ios/compare/0.9.0...0.10.0) - 2023-06-28 +## [0.10.0](https://github.com/airbnb/epoxy-ios/compare/0.9.0...0.10.0) - 2023-06-29 ### Changed - Dropped support for Swift 5.4. diff --git a/Sources/EpoxyCore/SwiftUI/UIView+SwiftUIView.swift b/Sources/EpoxyCore/SwiftUI/UIView+SwiftUIView.swift index 03707a79..4307a7ce 100644 --- a/Sources/EpoxyCore/SwiftUI/UIView+SwiftUIView.swift +++ b/Sources/EpoxyCore/SwiftUI/UIView+SwiftUIView.swift @@ -34,6 +34,6 @@ extension ViewTypeProtocol { /// A protocol that all `UIView`s conform to, enabling extensions that have a `Self` reference. public protocol ViewTypeProtocol: ViewType { } -// MARK: - ViewType + UIViewProtocol +// MARK: - ViewType + ViewTypeProtocol extension ViewType: ViewTypeProtocol { } diff --git a/Sources/EpoxyCore/Views/ViewType.swift b/Sources/EpoxyCore/Views/ViewType.swift index cb64a794..1a0dbe01 100644 --- a/Sources/EpoxyCore/Views/ViewType.swift +++ b/Sources/EpoxyCore/Views/ViewType.swift @@ -23,6 +23,7 @@ extension ViewRepresentableType { /// Either `UIViewType` on iOS/tvOS or `NSViewType` on macOS. public typealias RepresentableViewType = UIViewType } + #elseif os(macOS) import AppKit