Strict concurrency and project maintenance

* Support strict conncurrency
* Update CI builds to run on macOS 14
* Update snapshot tests to run on iOS 17 and iPadOS 17
* Bump minimum deployment target to iOS 13

.github/workflows/ci.yml

@@ -9,18 +9,16 @@ on:
 jobs:
   xcode-build:
     name: Xcode Build
-    runs-on: macOS-11
+    runs-on: macOS-14
     strategy:
       matrix:
-        platform: ['iOS_14', 'iOS_13']
+        platform: ['iOS_17', 'iPadOS_17']
       fail-fast: false
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
       - name: Select Xcode Version
-        run: sudo xcode-select --switch /Applications/Xcode_13.2.1.app/Contents/Developer
-      - name: Prepare Simulator Runtimes
-        run: Scripts/github/prepare-simulators.sh ${{ matrix.platform }}
+        run: sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer
       - name: Bundle Install
         run: bundle install
       - name: Pod Install
@@ -35,37 +33,37 @@ jobs:
           path: .build/derivedData/**/Logs/Test/*.xcresult
   pod-lint:
     name: Lint Pod
-    runs-on: macOS-12
+    runs-on: macOS-14
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
       - name: Bundle Install
         run: bundle install
       - name: Select Xcode Version
-        run: sudo xcode-select --switch /Applications/Xcode_14.1.app/Contents/Developer
+        run: sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer
       - name: Lint Podspec
         run: bundle exec pod lib lint --verbose --fail-fast
   spm:
     name: SPM Build
-    runs-on: macOS-12
+    runs-on: macOS-14
     strategy:
       matrix:
-        platform: ['iOS_16', 'iOS_15']
+        platform: ['iOS_17']
       fail-fast: false
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
       - name: Select Xcode Version
-        run: sudo xcode-select --switch /Applications/Xcode_14.1.app/Contents/Developer
-      - name: Prepare Simulator Runtimes
-        run: Scripts/github/prepare-simulators.sh ${{ matrix.platform }}
+        run: sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer
       - name: Build
         run: Scripts/build.swift spm ${{ matrix.platform }} `which xcpretty`
   bazel:
     name: Bazel
-    runs-on: macOS-12
+    runs-on: macOS-14
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
+      - name: Select Xcode Version
+        run: sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer
       - name: Build and Test
         run: bazel test //...

BUILD.bazel

@@ -34,15 +34,15 @@ ios_framework(
         "ipad",
     ],
     infoplists = ["Paralayout/Info.plist"],
-    minimum_os_version = "12.0",
+    minimum_os_version = "13.0",
     visibility = ["//visibility:public"],
     deps = [":Paralayout.lib"],
 )
 
 ios_unit_test(
     name = "ParalayoutTests",
     bundle_name = "ParalayoutTests",
-    minimum_os_version = "12.0",
+    minimum_os_version = "13.0",
     runner = "@rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
     deps = [":ParalayoutTests.lib"],
 )

Example/ParalayoutDemo.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */

Example/ParalayoutSnapshotTests/SnapshotTestCase.swift

@@ -46,11 +46,11 @@ class SnapshotTestCase: XCTestCase {
 
     private static let testedDevices = [
 
-        // iPhone 12 Pro (14.4)
-        TestDeviceConfig(systemVersion: "14.4", screenSize: CGSize(width: 390, height: 844), screenScale: 3),
+        // iPhone 15 Pro - iOS 17.5
+        TestDeviceConfig(systemVersion: "17.5", screenSize: CGSize(width: 393, height: 852), screenScale: 3),
 
-        // iPhone 11 Pro (13.7)
-        TestDeviceConfig(systemVersion: "13.7", screenSize: CGSize(width: 375, height: 812), screenScale: 3),
+        // iPad (10th Generation) - iPadOS 17.5
+        TestDeviceConfig(systemVersion: "17.5", screenSize: CGSize(width: 820, height: 1180), screenScale: 2),
 
     ]
 

Example/ParalayoutSnapshotTests/ViewAlignmentSnapshotTests.swift

@@ -19,6 +19,7 @@ import SnapshotTesting
 
 final class ViewAlignmentSnapshotTests: SnapshotTestCase {
 
+    @MainActor
     func testSiblingAlignment() {
         let containerView = UIView(frame: .init(x: 0, y: 0, width: 200, height: 200))
         containerView.backgroundColor = .white
@@ -80,6 +81,7 @@ final class ViewAlignmentSnapshotTests: SnapshotTestCase {
         verifySnapshot(receiverPosition: .center, targetPosition: .topRight, verticalOffset: -15)
     }
 
+    @MainActor
     func testLayoutDirection() {
         let containerView = UIView(frame: .init(x: 0, y: 0, width: 100, height: 100))
         containerView.backgroundColor = .white
@@ -140,6 +142,7 @@ final class ViewAlignmentSnapshotTests: SnapshotTestCase {
         assertSnapshot(matching: containerView, as: .image, named: nameForSnapshot(with: []))
     }
 
+    @MainActor
     func testTransformHasNoEffect() {
         let containerView = UIView(frame: .init(x: 0, y: 0, width: 100, height: 100))
         containerView.backgroundColor = .white
@@ -185,6 +188,7 @@ final class ViewAlignmentSnapshotTests: SnapshotTestCase {
         verifySnapshot(receiverTransform: .identity, targetTransform: .init(scaleX: 2, y: 3))
     }
 
+    @MainActor
     func testNonZeroBoundsOrigin() {
         let containerView = UIView(frame: CGRect(x: 0, y: 0, width: 200, height: 200))
         containerView.backgroundColor = .white
@@ -213,6 +217,7 @@ final class ViewAlignmentSnapshotTests: SnapshotTestCase {
         assertSnapshot(matching: containerView, as: .image, named: nameForSnapshot(with: []))
     }
 
+    @MainActor
     func testAlignmentWithLayoutMargins() {
         let containerView = UIView(frame: CGRect(x: 0, y: 0, width: 200, height: 200))
         containerView.backgroundColor = .white
@@ -246,6 +251,7 @@ final class ViewAlignmentSnapshotTests: SnapshotTestCase {
         assertSnapshot(matching: containerView, as: .image, named: nameForSnapshot(with: ["bothLayoutMargins"]))
     }
 
+    @MainActor
     func testAlignmentUsingCapInsets() {
         let containerView = UIView(frame: CGRect(x: 0, y: 0, width: 250, height: 100))
         containerView.backgroundColor = .white
@@ -269,6 +275,7 @@ final class ViewAlignmentSnapshotTests: SnapshotTestCase {
         assertSnapshot(matching: containerView, as: .image, named: nameForSnapshot(with: []))
     }
 
+    @MainActor
     func testAlignmentUsingFirstLine() {
         let containerView = UIView(frame: CGRect(x: 0, y: 0, width: 250, height: 100))
         containerView.backgroundColor = .white
@@ -299,6 +306,7 @@ final class ViewAlignmentSnapshotTests: SnapshotTestCase {
         assertSnapshot(matching: containerView, as: .image, named: nameForSnapshot(with: []))
     }
 
+    @MainActor
     func testAlignmentUsingFirstLineCapInsets() {
         let containerView = UIView(frame: CGRect(x: 0, y: 0, width: 250, height: 100))
         containerView.backgroundColor = .white
@@ -329,6 +337,7 @@ final class ViewAlignmentSnapshotTests: SnapshotTestCase {
         assertSnapshot(matching: containerView, as: .image, named: nameForSnapshot(with: []))
     }
 
+    @MainActor
     func testAlignmentWithRect() {
         let containerView = UIView(frame: CGRect(x: 0, y: 0, width: 200, height: 200))
         containerView.backgroundColor = .white
@@ -365,6 +374,7 @@ final class ViewAlignmentSnapshotTests: SnapshotTestCase {
         assertSnapshot(matching: containerView, as: .image, named: nameForSnapshot(with: []))
     }
 
+    @MainActor
     func testAlignmentWithFrame() {
         let targetTransform = CGAffineTransform(translationX: -20, y: 10)
         let receiverTransform = CGAffineTransform(scaleX: 0.8, y: 0.8)

Example/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
-  - Paralayout (1.0.0)
-  - Paralayout/Tests (1.0.0)
+  - Paralayout (1.1.0)
+  - Paralayout/Tests (1.1.0)
   - SnapshotTesting (1.8.2)
 
 DEPENDENCIES:
@@ -17,9 +17,9 @@ EXTERNAL SOURCES:
     :path: "../Paralayout.podspec"
 
 SPEC CHECKSUMS:
-  Paralayout: 63a087763d2c7a1b9c55843064e889aa27bdb56a
+  Paralayout: 148233f7ff311384bcb209bf0b1b8a1578ad1d34
   SnapshotTesting: 38947050d13960d57a4a9c166fcf51bca7d56970
 
 PODFILE CHECKSUM: f0cdc6633e8d65e479af433fa427d7c0ce7c72b1
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.14.3

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.0.1
+// swift-tools-version:5.9
 
 //
 //  Copyright 2020 Square Inc.
@@ -21,19 +21,22 @@ import PackageDescription
 let package = Package(
 	name: "Paralayout",
 	platforms: [
-		.iOS(.v12),
+		.iOS(.v13),
 	],
 	products: [
 		.library(
 			name: "Paralayout",
-			targets: ["Paralayout"]
+            targets: ["Paralayout"]
 		),
 	],
 	targets: [
 		.target(
 			name: "Paralayout",
 			dependencies: [],
-			path: "Paralayout"
+			path: "Paralayout",
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency")
+            ]
 		),
 		.testTarget(
             name: "ParalayoutTests",

Paralayout.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name     = 'Paralayout'
-  s.version  = '1.0.0'
+  s.version  = '1.1.0'
   s.license  = 'Apache License, Version 2.0'
   s.summary  = 'Paralayout is a simple set of assistive UI layout utilities. Size and position your UI with pixel-perfect precision. Design will love you!'
   s.homepage = 'https://github.com/square/Paralayout'
   s.authors  = 'Square'
   s.source   = { :git => 'https://github.com/square/Paralayout.git', :tag => s.version }
   s.source_files = 'Paralayout/*.{swift}'
-  s.ios.deployment_target = '12.0'
-  s.swift_version = '5.0'
+  s.ios.deployment_target = '13.0'
+  s.swift_version = '5.9'
 
   s.test_spec 'Tests' do |test_spec|
     test_spec.source_files = 'ParalayoutTests/*{.swift}'

Paralayout/Alignable.swift

@@ -17,12 +17,14 @@
 import UIKit
 
 /// Describes an object that can participate in alignment. In practice, this represents a view.
+@MainActor
 public protocol Alignable {
 
     var alignmentContext: AlignmentContext { get }
 
 }
 
+@MainActor
 public struct AlignmentContext {
 
     // MARK: - Life Cycle

Paralayout/Angle.swift

@@ -16,7 +16,7 @@
 
 import CoreGraphics
 
-public struct Angle: Comparable {
+public struct Angle: Comparable, Sendable {
 
     // MARK: - Public Static Properties
 

Paralayout/AspectRatio.swift

@@ -17,7 +17,7 @@
 import UIKit
 
 /// A value type representing the ratio between a width and a height.
-public struct AspectRatio: Comparable, CustomDebugStringConvertible {
+public struct AspectRatio: Comparable, CustomDebugStringConvertible, Sendable {
 
     // MARK: - Public Static Properties
 
@@ -105,6 +105,7 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible {
     ///
     /// - parameter width: The desired width.
     /// - parameter scaleFactor: The view/window/screen to use for pixel rounding.
+    @MainActor
     public func height(forWidth width: CGFloat, in scaleFactor: ScaleFactorProviding) -> CGFloat {
         return (ratioHeight * width / ratioWidth).roundedToPixel(in: scaleFactor)
     }
@@ -113,6 +114,7 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible {
     ///
     /// - parameter height: The desired height.
     /// - parameter scaleFactor: The view/window/screen to use for pixel rounding.
+    @MainActor
     public func width(forHeight height: CGFloat, in scaleFactor: ScaleFactorProviding) -> CGFloat {
         return (ratioWidth * height / ratioHeight).roundedToPixel(in: scaleFactor)
     }
@@ -122,6 +124,7 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible {
     ///
     /// - parameter width: The desired width.
     /// - parameter scaleFactor: The view/window/screen to use for pixel rounding.
+    @MainActor
     public func size(forWidth width: CGFloat, in scaleFactor: ScaleFactorProviding) -> CGSize {
         return CGSize(
             width: width,
@@ -134,6 +137,7 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible {
     ///
     /// - parameter height: The desired height.
     /// - parameter scaleFactor: The view/window/screen to use for pixel rounding.
+    @MainActor
     public func size(forHeight height: CGFloat, in scaleFactor: ScaleFactorProviding) -> CGSize {
         return CGSize(
             width: width(forHeight: height, in: scaleFactor),
@@ -147,6 +151,7 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible {
     /// - parameter size: The bounding size.
     /// - parameter scaleFactor: The view/window/screen to use for pixel alignment.
     /// - returns: A size with the receiver's aspect ratio, no larger than the bounding size.
+    @MainActor
     public func size(toFit size: CGSize, in scaleFactor: ScaleFactorProviding) -> CGSize {
         if size.aspectRatio <= self {
             // Match width, narrow the height.
@@ -169,6 +174,7 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible {
     /// - parameter scaleFactor: The view/window/screen to use for pixel alignment.
     /// - parameter layoutDirection: The effective layout direction of the view in which the `rect` is defined.
     /// - returns: A rect with the receiver's aspect ratio, strictly within the bounding rect.
+    @MainActor
     public func rect(
         toFit rect: CGRect,
         at position: Position,
@@ -193,6 +199,7 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible {
     /// - parameter context: The view/window/screen that provides the scale factor and effective layout direction in
     /// which the rect should be positioned.
     /// - returns: A rect with the receiver's aspect ratio, strictly within the bounding rect.
+    @MainActor
     public func rect(
         toFit rect: CGRect,
         at position: Position,
@@ -212,6 +219,7 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible {
     /// - parameter size: The bounding size.
     /// - parameter scaleFactor: The view/window/screen to use for pixel alignment.
     /// - returns: A size with the receiver's aspect ratio, at least as large as the bounding size.
+    @MainActor
     public func size(toFill size: CGSize, in scaleFactor: ScaleFactorProviding) -> CGSize {
         if size.aspectRatio <= self {
             // Match height, expand the width.
@@ -234,6 +242,7 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible {
     /// - parameter scaleFactor: The view/window/screen to use for pixel alignment.
     /// - parameter layoutDirection: The effective layout direction of the view in which the `rect` is defined.
     /// - returns: A rect with the receiver's aspect ratio, strictly containing the bounding rect.
+    @MainActor
     public func rect(
         toFill rect: CGRect,
         at position: Position,
@@ -257,6 +266,7 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible {
     /// - parameter context: The view/window/screen that provides the scale factor and effective layout direction in
     /// which the rect should be positioned.
     /// - returns: A rect with the receiver's aspect ratio, strictly containing the bounding rect.
+    @MainActor
     public func rect(
         toFill rect: CGRect,
         at position: Position,
@@ -294,6 +304,7 @@ extension CGRect {
 
     // MARK: - Life Cycle
 
+    @MainActor
     fileprivate init(
         size newSize: CGSize,
         at position: Position,

Paralayout/Interpolation.swift

@@ -102,7 +102,7 @@ public enum Clamp {
 
 // MARK: -
 
-public struct Interpolation: Comparable {
+public struct Interpolation: Comparable, Sendable {
 
     // MARK: - Public Types
 

Paralayout/LayoutDirection.swift

@@ -17,6 +17,7 @@
 import UIKit
 
 /// Defines an object that vends its current user interface layout direction.
+@MainActor
 public protocol LayoutDirectionProviding {
 
     var effectiveUserInterfaceLayoutDirection: UIUserInterfaceLayoutDirection { get }