Skip to content

Update to Swift 6.1 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dave-kr merged 1 commit into from
May 15, 2025
Merged

Update to Swift 6.1 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 0 additions & 14 deletions CombineExtensions.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions DemoApp/DemoApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 2 additions & 6 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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",
Expand All @@ -25,8 +22,7 @@ let package = Package(
.testTarget(
name: "CombineExtensionsTests",
dependencies: [
.byName(name: "CombineExtensions"),
.product(name: "Gauntlet", package: "Gauntlet-iOS")
.byName(name: "CombineExtensions")
]
)
]
Expand Down
2 changes: 1 addition & 1 deletion Sources/CombineExtensions/ObjectOwnership.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading