Merge pull request #723 from rechsteiner/swift-6

Enable Swift 6 mode

.github/workflows/parchment.yml

@@ -2,13 +2,13 @@ name: "Parchment"
 on: [push]
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: latest-stable
+          xcode-version: '16.0-beta'
       - uses: actions/checkout@v3
       - name: Unit Tests
-        run: xcodebuild -project Parchment.xcodeproj -scheme "Parchment" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=17.5' test
+        run: xcodebuild -project Parchment.xcodeproj -scheme "Parchment" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=18.0' test
       - name: UI Tests
-        run: xcodebuild -project Parchment.xcodeproj -scheme "ParchmentUITests" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=17.5' test
+        run: xcodebuild -project Parchment.xcodeproj -scheme "ParchmentUITests" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=18.0' test

.swift-version

@@ -1 +1 @@
-5.10
+6.0

Example/AppDelegate.swift

@@ -1,6 +1,6 @@
 import UIKit
 
-@UIApplicationMain
+@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 }

Example/Examples/Calendar/DateFormatters.swift

@@ -1,20 +1,20 @@
 import Foundation
 
 struct DateFormatters {
-    static var shortDateFormatter: DateFormatter = {
+    static let shortDateFormatter: DateFormatter = {
         let dateFormatter = DateFormatter()
         dateFormatter.timeStyle = .none
         dateFormatter.dateStyle = .short
         return dateFormatter
     }()
 
-    static var dateFormatter: DateFormatter = {
+    static let dateFormatter: DateFormatter = {
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "d"
         return dateFormatter
     }()
 
-    static var weekdayFormatter: DateFormatter = {
+    static let weekdayFormatter: DateFormatter = {
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "EEE"
         return dateFormatter

Example/Examples/Images/ImagesViewController.swift

@@ -1,6 +1,7 @@
 import Parchment
 import UIKit
 
+@MainActor
 protocol ImagesViewControllerDelegate: AnyObject {
     func imagesViewControllerDidScroll(_: ImagesViewController)
 }

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.10
+// swift-tools-version: 6.0
 import PackageDescription
 
 let package = Package(

Parchment.xcodeproj/project.pbxproj

@@ -937,7 +937,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1130;
-				LastUpgradeCheck = 1540;
+				LastUpgradeCheck = 1600;
 				ORGANIZATIONNAME = "Martin Rechsteiner";
 				TargetAttributes = {
 					3E504EC31C7465B000AE1CE3 = {
@@ -1275,7 +1275,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.martinrechsteiner.ParchmentTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
 			};
 			name = Debug;
@@ -1292,7 +1291,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.martinrechsteiner.ParchmentTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
 			};
 			name = Release;
@@ -1351,7 +1349,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0.1;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1406,7 +1404,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				SWIFT_VERSION = 3.0.1;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1441,7 +1439,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1471,14 +1468,12 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.martinrechsteiner.Parchment;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
 		3EA04A6A1C53BFF40054E5E0 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				DEVELOPMENT_TEAM = G4TGN24VA2;
@@ -1490,14 +1485,12 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.martinrechsteiner.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		3EA04A6B1C53BFF40054E5E0 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				DEVELOPMENT_TEAM = G4TGN24VA2;
@@ -1509,7 +1502,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.martinrechsteiner.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1537,7 +1529,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.martinrechsteiner.ParchmentUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_TARGET_NAME = Example;
 			};
@@ -1565,7 +1556,6 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.martinrechsteiner.ParchmentUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_TARGET_NAME = Example;
 			};
@@ -1597,7 +1587,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.martinrechsteiner.ExampleSwiftUI;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1626,7 +1615,6 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.martinrechsteiner.ExampleSwiftUI;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

Parchment.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

Parchment.xcodeproj/xcshareddata/xcschemes/ExampleSwiftUI.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

Parchment.xcodeproj/xcshareddata/xcschemes/Parchment.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Parchment/Classes/PagingBorderLayoutAttributes.swift

@@ -1,8 +1,8 @@
 import UIKit
 
 open class PagingBorderLayoutAttributes: UICollectionViewLayoutAttributes {
-    open var backgroundColor: UIColor?
-    open var insets: UIEdgeInsets = UIEdgeInsets()
+    nonisolated(unsafe) open var backgroundColor: UIColor?
+    nonisolated(unsafe) open var insets: UIEdgeInsets = UIEdgeInsets()
 
     open override func copy(with zone: NSZone? = nil) -> Any {
         let copy = super.copy(with: zone) as! PagingBorderLayoutAttributes

Parchment/Classes/PagingCellLayoutAttributes.swift

@@ -3,7 +3,7 @@ import UIKit
 /// A custom `UICollectionViewLayoutAttributes` subclass that adds a
 /// `progress` property indicating how far the user has scrolled.
 open class PagingCellLayoutAttributes: UICollectionViewLayoutAttributes {
-    open var progress: CGFloat = 0.0
+    nonisolated(unsafe) open var progress: CGFloat = 0.0
 
     open override func copy(with zone: NSZone? = nil) -> Any {
         let copy = super.copy(with: zone) as! PagingCellLayoutAttributes

Parchment/Classes/PagingIndicatorLayoutAttributes.swift

@@ -1,7 +1,7 @@
 import UIKit
 
 open class PagingIndicatorLayoutAttributes: UICollectionViewLayoutAttributes {
-    open var backgroundColor: UIColor?
+    nonisolated(unsafe) open var backgroundColor: UIColor?
 
     open override func copy(with zone: NSZone? = nil) -> Any {
         let copy = super.copy(with: zone) as! PagingIndicatorLayoutAttributes

Parchment/Protocols/PagingViewControllerSizeDelegate.swift

@@ -1,5 +1,6 @@
 import UIKit
 
+@MainActor
 public protocol PagingViewControllerSizeDelegate: AnyObject {
     /// Manually control the width for a given `PagingItem`. Parchment
     /// does not support self-sizing cells, so you have to use this if

ParchmentTests/Mocks/Mock.swift

@@ -7,11 +7,13 @@ enum Action: Equatable {
 }
 
 struct MockCall: Equatable {
+    @MainActor
     static var callCount: Int = 0
 
     let index: Int
     let action: Action
 
+    @MainActor
     init(action: Action) {
         Self.callCount += 1
         self.index = Self.callCount
@@ -25,6 +27,7 @@ extension MockCall: Comparable {
     }
 }
 
+@MainActor
 protocol Mock {
     var calls: [MockCall] { get }
 }

ParchmentTests/Mocks/MockCollectionView.swift

@@ -1,6 +1,7 @@
 @testable import Parchment
 import UIKit
 
+@MainActor
 final class MockCollectionView: CollectionView, Mock {
     enum Action: Equatable {
         case contentOffset(CGPoint)

ParchmentTests/Mocks/MockPagingControllerDelegate.swift

@@ -1,6 +1,7 @@
 import Foundation
 @testable import Parchment
 
+@MainActor
 final class MockPagingControllerDelegate: PagingMenuDelegate, Mock {
     enum Action: Equatable {
         case selectContent(pagingItem: Item, direction: PagingDirection, animated: Bool)