From 23877982890ceeddd28a131f19911543167a1509 Mon Sep 17 00:00:00 2001 From: Dave Camp Date: Thu, 15 May 2025 08:55:20 -0700 Subject: [PATCH] Update to Swift 6.1 Updated package to Swift 6.1. Removed unused dependency on Gauntlet. --- .github/workflows/build.yml | 2 +- .../xcshareddata/swiftpm/Package.resolved | 14 -------------- DemoApp/DemoApp.xcodeproj/project.pbxproj | 4 ++-- Package.swift | 8 ++------ Sources/CombineExtensions/ObjectOwnership.swift | 2 +- 5 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 CombineExtensions.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6349c11..c85de38 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,6 @@ on: jobs: build-and-test-ios: name: Build Combine Extensions iOS - uses: krogerco/Shared-CI-Workflow-iOS/.github/workflows/build.yml@v1.0.0 + uses: krogerco/Shared-CI-Workflow-iOS/.github/workflows/build.yml@v2 with: FILENAME: CombineExtensions.xcworkspace diff --git a/CombineExtensions.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CombineExtensions.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index d0b6806..0000000 --- a/CombineExtensions.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "gauntlet-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/krogerco/Gauntlet-iOS.git", - "state" : { - "revision" : "4a4fe12bb927e775112c97686f57c52392d72ae1", - "version" : "1.1.0" - } - } - ], - "version" : 2 -} diff --git a/DemoApp/DemoApp.xcodeproj/project.pbxproj b/DemoApp/DemoApp.xcodeproj/project.pbxproj index ecce1b1..3bc26c1 100644 --- a/DemoApp/DemoApp.xcodeproj/project.pbxproj +++ b/DemoApp/DemoApp.xcodeproj/project.pbxproj @@ -335,7 +335,7 @@ SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -371,7 +371,7 @@ SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Package.swift b/Package.swift index 7c467dc..c27b638 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.7 +// swift-tools-version: 6.1 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -14,9 +14,6 @@ let package = Package( name: "CombineExtensions", targets: ["CombineExtensions"]) ], - dependencies: [ - .package(url: "https://github.com/krogerco/Gauntlet-iOS.git", from: Version(1, 1, 0)) - ], targets: [ .target( name: "CombineExtensions", @@ -25,8 +22,7 @@ let package = Package( .testTarget( name: "CombineExtensionsTests", dependencies: [ - .byName(name: "CombineExtensions"), - .product(name: "Gauntlet", package: "Gauntlet-iOS") + .byName(name: "CombineExtensions") ] ) ] diff --git a/Sources/CombineExtensions/ObjectOwnership.swift b/Sources/CombineExtensions/ObjectOwnership.swift index 6fcf8dc..6ffc37b 100644 --- a/Sources/CombineExtensions/ObjectOwnership.swift +++ b/Sources/CombineExtensions/ObjectOwnership.swift @@ -25,7 +25,7 @@ SOFTWARE. import Foundation /// Retain strategy for objects in subscription operators -public enum ObjectOwnership { +public enum ObjectOwnership: Sendable { /// Strongly retains the object in the subscription case strong