Skip to content

Commit

Permalink
Add Swift 5.10 support
Browse files Browse the repository at this point in the history
  • Loading branch information
ffried committed Mar 11, 2024
1 parent a72b5e5 commit 252cf4a
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: sersoft-gmbh/oss-common-actions/.github/workflows/swift-generate-and-publish-docs.yml@main
with:
os: ubuntu
swift-version: '5.9'
swift-version: '5.10'
organisation: ${{ github.repository_owner }}
repository: ${{ github.event.repository.name }}
pages-branch: gh-pages
7 changes: 4 additions & 3 deletions .github/workflows/swift-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
jobs:
variables:
outputs:
max-supported-swift-version: '5.9'
max-supported-swift-version: '5.10'
xcode-scheme: auth-scope
xcode-platform-version: latest
fail-if-codecov-fails: true
Expand All @@ -25,7 +25,7 @@ jobs:
strategy:
matrix:
os: [ macOS, ubuntu ]
swift-version-offset: [ 0 ]
swift-version-offset: [ 0, 1 ]
uses: sersoft-gmbh/oss-common-actions/.github/workflows/swift-test-spm.yml@main
with:
os: ${{ matrix.os }}
Expand All @@ -45,7 +45,8 @@ jobs:
- iPadOS
- tvOS
- watchOS
swift-version-offset: [ 0 ]
- visionOS
swift-version-offset: [ 0, 1 ]
uses: sersoft-gmbh/oss-common-actions/.github/workflows/swift-test-xcode.yml@main
with:
xcode-scheme: ${{ needs.variables.outputs.xcode-scheme }}
Expand Down
7 changes: 5 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.9
// swift-tools-version:5.10
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand All @@ -8,9 +8,12 @@ let swiftSettings: Array<SwiftSetting> = [
.enableUpcomingFeature("ExistentialAny"),
.enableUpcomingFeature("BareSlashRegexLiterals"),
.enableUpcomingFeature("DisableOutwardActorInference"),
.enableUpcomingFeature("IsolatedDefaultValues"),
.enableUpcomingFeature("DeprecateApplicationMain"),
.enableExperimentalFeature("StrictConcurrency"),
.enableExperimentalFeature("GlobalConcurrency"),
// .enableExperimentalFeature("AccessLevelOnImport"),
// .enableExperimentalFeature("VariadicGenerics"),
// .unsafeFlags(["-warn-concurrency"], .when(configuration: .debug)),
]

let package = Package(
Expand Down
38 changes: 38 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// swift-tools-version:5.9
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let swiftSettings: Array<SwiftSetting> = [
.enableUpcomingFeature("ConciseMagicFile"),
.enableUpcomingFeature("ExistentialAny"),
.enableUpcomingFeature("BareSlashRegexLiterals"),
.enableUpcomingFeature("DisableOutwardActorInference"),
.enableExperimentalFeature("StrictConcurrency"),
// .enableExperimentalFeature("AccessLevelOnImport"),
// .enableExperimentalFeature("VariadicGenerics"),
]

let package = Package(
name: "auth-scope",
products: [
// Products define the executables and libraries produced by a package, and make them visible to other packages.
.library(
name: "AuthScope",
targets: ["AuthScope"]),
],
dependencies: [
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
.target(
name: "AuthScope",
swiftSettings: swiftSettings),
.testTarget(
name: "AuthScopeTests",
dependencies: ["AuthScope"],
swiftSettings: swiftSettings),
]
)
2 changes: 1 addition & 1 deletion Sources/AuthScope/Scope+ScopeString.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extension Scope {

/// Creates a new scope from a given scope string. Throws an error if the string contains invalid access ranges.
///
/// - Parameter scopeString: The scope string (e.g. created by `scopeString` of an existing scope) to parse.
/// - Parameter scopeString: The scope string (e.g. created by ``Scope/scopeString`` of an existing scope) to parse.
/// - Throws: An error if at least one of the access ranges in the scope string is invalid.
/// - SeeAlso: ``AccessRangeProtocol/init(validating:)``
public init(scopeString: some StringProtocol) throws {
Expand Down

0 comments on commit 252cf4a

Please sign in to comment.