Bump to Swift 5.9 (#139)

davdroman · Jul 19, 2024 · ddc7d42 · ddc7d42
1 parent ad6ecab
commit ddc7d42
Show file tree

Hide file tree

Showing 25 changed files with 45 additions and 48 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
     branches:
       - "**"
   schedule:
-    - cron: '3 3 * * 2'  # 3:03 AM, every Tuesday
+    - cron: "3 3 * * 2" # 3:03 AM, every Tuesday
 
 concurrency:
   group: ci-${{ github.ref }}
@@ -17,7 +17,7 @@ concurrency:
 jobs:
   macOS:
     name: ${{ matrix.platform }} (Swift ${{ matrix.swift }})
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
@@ -26,9 +26,8 @@ jobs:
           - mac-catalyst
           - tvOS
         swift:
-          - 5.7
-          - 5.8
-          - 5.9
+          - "5.9"
+          - "5.10"
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4

diff --git a/Package.swift b/Package.swift
@@ -1,5 +1,4 @@
-// swift-tools-version: 5.7
-// The swift-tools-version declares the minimum version of Swift required to build this package.
+// swift-tools-version: 5.9
 
 import PackageDescription
 

diff --git a/Sources/Animation/Animation.swift b/Sources/Animation/Animation.swift
@@ -3,8 +3,8 @@ import UIKit
 public struct Animation {
 	static var defaultDuration: Double { 0.35 }
 
-	@_spi(package) public var duration: Double
-	@_spi(package) public let timingParameters: UITimingCurveProvider
+	package var duration: Double
+	package let timingParameters: UITimingCurveProvider
 
 	init(duration: Double, timingParameters: UITimingCurveProvider) {
 		self.duration = duration

diff --git a/Sources/Animator/AnimatorTransientView.swift b/Sources/Animator/AnimatorTransientView.swift
@@ -32,29 +32,29 @@ public class AnimatorTransientView {
 	/// Note: these changes are *not* animated.
 	public var completion: Properties
 
-	@_spi(package) public let uiView: UIView
+	package let uiView: UIView
 
 	/// Read-only proxy to underlying `UIView` properties.
 	public subscript<T>(dynamicMember keyPath: KeyPath<UIView, T>) -> T {
 		uiView[keyPath: keyPath]
 	}
 
-	@_spi(package) public init(_ uiView: UIView) {
+	package init(_ uiView: UIView) {
 		self.initial = Properties(of: uiView)
 		self.animation = Properties(of: uiView)
 		self.completion = Properties(of: uiView)
 
 		self.uiView = uiView
 	}
 
-	@_spi(package) public func setUIViewProperties(
+	package func setUIViewProperties(
 		to properties: KeyPath<AnimatorTransientView, Properties>,
 		force: Bool = false
 	) {
 		self[keyPath: properties].assignToUIView(uiView, force: force)
 	}
 
-	@_spi(package) public func resetUIViewProperties() {
+	package func resetUIViewProperties() {
 		Properties.default.assignToUIView(uiView, force: true)
 	}
 }
diff --git a/Sources/Animator/Transform.swift b/Sources/Animator/Transform.swift
@@ -35,7 +35,6 @@ extension CATransform3D {
 	}
 }
 
-@_spi(package)
 extension CATransform3D: Equatable {
 	@inlinable
 	public static func == (lhs: Self, rhs: Self) -> Bool {

diff --git a/Sources/AtomicTransition/Rotate3D.swift b/Sources/AtomicTransition/Rotate3D.swift
@@ -1,4 +1,4 @@
-@_spi(package) import Animator
+import Animator
 import SwiftUI
 
 /// A transition that rotates the view from `angle` to zero on insertion, and from zero to `angle` on removal.

diff --git a/Sources/AtomicTransition/ZPosition.swift b/Sources/AtomicTransition/ZPosition.swift
@@ -1,4 +1,4 @@
-@_spi(package) import Animator
+import Animator
 import UIKit
 
 /// A transition that changes the view layer’s position on the z axis.

diff --git a/Sources/NavigationTransition/AnyNavigationTransition.swift b/Sources/NavigationTransition/AnyNavigationTransition.swift
@@ -2,27 +2,27 @@ import Animation
 import UIKit
 
 public struct AnyNavigationTransition {
-	@_spi(package) public typealias TransientHandler = (
+	package typealias TransientHandler = (
 		AnimatorTransientView,
 		AnimatorTransientView,
 		NavigationTransitionOperation,
 		UIView
 	) -> Void
 
-	@_spi(package) public typealias PrimitiveHandler = (
+	package typealias PrimitiveHandler = (
 		Animator,
 		NavigationTransitionOperation,
 		UIViewControllerContextTransitioning
 	) -> Void
 
-	@_spi(package) public enum Handler {
+	package enum Handler {
 		case transient(TransientHandler)
 		case primitive(PrimitiveHandler)
 	}
 
-	@_spi(package) public let isDefault: Bool
-	@_spi(package) public let handler: Handler
-	@_spi(package) public var animation: Animation? = .default
+	package let isDefault: Bool
+	package let handler: Handler
+	package var animation: Animation? = .default
 
 	public init(_ transition: some NavigationTransition) {
 		self.isDefault = false

diff --git a/Sources/NavigationTransition/Default.swift b/Sources/NavigationTransition/Default.swift
@@ -17,10 +17,10 @@ extension AnyNavigationTransition {
 	}
 }
 
-@_spi(package) public struct Default: PrimitiveNavigationTransition {
+package struct Default: PrimitiveNavigationTransition {
 	init() {}
 
-	public func transition(with animator: Animator, for operation: TransitionOperation, in context: Context) {
+	package func transition(with animator: Animator, for operation: TransitionOperation, in context: Context) {
 		// NO-OP
 	}
 }
diff --git a/Sources/NavigationTransition/NavigationTransition.swift b/Sources/NavigationTransition/NavigationTransition.swift
@@ -86,7 +86,7 @@ public enum NavigationTransitionOperation: Hashable {
 	case push
 	case pop
 
-	@_spi(package) public init?(_ operation: UINavigationController.Operation) {
+	package init?(_ operation: UINavigationController.Operation) {
 		switch operation {
 		case .push:
 			self = .push

diff --git a/Sources/NavigationTransitions/NavigationTransition+UIKit.swift b/Sources/NavigationTransitions/NavigationTransition+UIKit.swift
@@ -1,4 +1,4 @@
-@_spi(package) import NavigationTransition
+import NavigationTransition
 import RuntimeAssociation
 import RuntimeSwizzling
 import UIKit

diff --git a/Sources/NavigationTransitions/NavigationTransitionDelegate.swift b/Sources/NavigationTransitions/NavigationTransitionDelegate.swift
@@ -1,6 +1,6 @@
-@_spi(package) import Animation
-@_spi(package) import Animator
-@_spi(package) import NavigationTransition
+import Animation
+import Animator
+import NavigationTransition
 import UIKit
 
 final class NavigationTransitionDelegate: NSObject, UINavigationControllerDelegate {

diff --git a/Sources/TestUtils/AnimatorTransientView+Mocks.swift b/Sources/TestUtils/AnimatorTransientView+Mocks.swift
@@ -1,4 +1,4 @@
-@_spi(package) @testable import Animator
+@testable import Animator
 import UIKit
 import XCTestDynamicOverlay
 

diff --git a/Tests/AnimatorTests/AnimatorTransientViewPropertiesTests.swift b/Tests/AnimatorTests/AnimatorTransientViewPropertiesTests.swift
@@ -1,4 +1,4 @@
-@_spi(package) @testable import Animator
+@testable import Animator
 import TestUtils
 
 final class AnimatorTransientViewPropertiesTests: XCTestCase {}

diff --git a/Tests/AnimatorTests/AnimatorTransientViewTests.swift b/Tests/AnimatorTests/AnimatorTransientViewTests.swift
@@ -1,4 +1,4 @@
-@_spi(package) @testable import Animator
+@testable import Animator
 import TestUtils
 
 final class AnimatorTransientViewTests: XCTestCase {}

diff --git a/Tests/AtomicTransitionTests/CombinedTests.swift b/Tests/AtomicTransitionTests/CombinedTests.swift
@@ -1,4 +1,4 @@
-@_spi(package) @testable import AtomicTransition
+@testable import AtomicTransition
 import TestUtils
 
 final class CombinedTests: XCTestCase {

diff --git a/Tests/AtomicTransitionTests/GroupTests.swift b/Tests/AtomicTransitionTests/GroupTests.swift
@@ -1,4 +1,4 @@
-@_spi(package) import AtomicTransition
+import AtomicTransition
 import TestUtils
 
 final class GroupTests: XCTestCase {

diff --git a/Tests/AtomicTransitionTests/IdentityTests.swift b/Tests/AtomicTransitionTests/IdentityTests.swift
@@ -1,4 +1,4 @@
-@_spi(package) import AtomicTransition
+import AtomicTransition
 import TestUtils
 
 final class IdentityTests: XCTestCase {

diff --git a/Tests/AtomicTransitionTests/MoveTests.swift b/Tests/AtomicTransitionTests/MoveTests.swift
@@ -1,5 +1,5 @@
-@_spi(package) @testable import Animator
-@_spi(package) import AtomicTransition
+@testable import Animator
+import AtomicTransition
 import TestUtils
 
 final class MoveTests: XCTestCase {

diff --git a/Tests/AtomicTransitionTests/OffsetTests.swift b/Tests/AtomicTransitionTests/OffsetTests.swift
@@ -1,5 +1,5 @@
-@_spi(package) @testable import Animator
-@_spi(package) import AtomicTransition
+@testable import Animator
+import AtomicTransition
 import TestUtils
 
 final class OffsetTests: XCTestCase {

diff --git a/Tests/AtomicTransitionTests/OnTests.swift b/Tests/AtomicTransitionTests/OnTests.swift
@@ -1,4 +1,4 @@
-@_spi(package) import AtomicTransition
+import AtomicTransition
 import TestUtils
 
 final class OnInsertionTests: XCTestCase {

diff --git a/Tests/AtomicTransitionTests/OpacityTests.swift b/Tests/AtomicTransitionTests/OpacityTests.swift
@@ -1,5 +1,5 @@
-@_spi(package) @testable import Animator
-@_spi(package) import AtomicTransition
+@testable import Animator
+import AtomicTransition
 import TestUtils
 
 final class OpacityTests: XCTestCase {

diff --git a/Tests/AtomicTransitionTests/RotateTests.swift b/Tests/AtomicTransitionTests/RotateTests.swift
@@ -1,5 +1,5 @@
-@_spi(package) @testable import Animator
-@_spi(package) import AtomicTransition
+@testable import Animator
+import AtomicTransition
 import TestUtils
 
 final class RotateTests: XCTestCase {

diff --git a/Tests/AtomicTransitionTests/ScaleTests.swift b/Tests/AtomicTransitionTests/ScaleTests.swift
@@ -1,5 +1,5 @@
-@_spi(package) @testable import Animator
-@_spi(package) import AtomicTransition
+@testable import Animator
+import AtomicTransition
 import TestUtils
 
 final class ScaleTests: XCTestCase {

diff --git a/Tests/AtomicTransitionTests/ZPositionTests.swift b/Tests/AtomicTransitionTests/ZPositionTests.swift
@@ -1,5 +1,5 @@
-@_spi(package) @testable import Animator
-@_spi(package) import AtomicTransition
+@testable import Animator
+import AtomicTransition
 import TestUtils
 
 final class ZPositionTests: XCTestCase {