Add Swift 6.0 support

.github/workflows/docs.yml

@@ -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.10'
+      swift-version: '6.0'
       organisation: ${{ github.repository_owner }}
       repository: ${{ github.event.repository.name }}
       pages-branch: gh-pages

.github/workflows/swift-test.yml

@@ -12,10 +12,10 @@ permissions:
 jobs:
   variables:
     outputs:
-      max-supported-swift-version: '5.10'
+      max-supported-swift-version: '6.0'
       xcode-scheme: auth-scope
       xcode-platform-version: latest
-      fail-if-codecov-fails: true
+      fail-if-codecov-fails: 'true'
     runs-on: ubuntu-latest
     steps:
       - run: exit 0
@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         os: [ macOS, ubuntu ]
-        swift-version-offset: [ 0, 1 ]
+        swift-version-offset: [ 0, 1, 2 ]
     uses: sersoft-gmbh/oss-common-actions/.github/workflows/swift-test-spm.yml@main
     with:
       os: ${{ matrix.os }}
@@ -46,7 +46,7 @@ jobs:
           - tvOS
           - watchOS
           - visionOS
-        swift-version-offset: [ 0, 1 ]
+        swift-version-offset: [ 0, 1, 2 ]
     uses: sersoft-gmbh/oss-common-actions/.github/workflows/swift-test-xcode.yml@main
     with:
       xcode-scheme: ${{ needs.variables.outputs.xcode-scheme }}

Package.swift

@@ -1,19 +1,13 @@
-// swift-tools-version:5.10
+// swift-tools-version:6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let swiftSettings: Array<SwiftSetting> = [
-    .enableUpcomingFeature("ConciseMagicFile"),
+    .swiftLanguageMode(.v6),
     .enableUpcomingFeature("ExistentialAny"),
-    .enableUpcomingFeature("BareSlashRegexLiterals"),
-    .enableUpcomingFeature("DisableOutwardActorInference"),
-    .enableUpcomingFeature("IsolatedDefaultValues"),
-    .enableUpcomingFeature("DeprecateApplicationMain"),
-    .enableExperimentalFeature("StrictConcurrency"),
+    .enableUpcomingFeature("InternalImportsByDefault"),
     .enableExperimentalFeature("GlobalConcurrency"),
-//    .enableExperimentalFeature("AccessLevelOnImport"),
-//    .enableExperimentalFeature("VariadicGenerics"),
 ]
 
 let package = Package(

Package@swift-5.10.swift

@@ -0,0 +1,41 @@
+// swift-tools-version:5.10
+// 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"),
+    .enableUpcomingFeature("IsolatedDefaultValues"),
+    .enableUpcomingFeature("DeprecateApplicationMain"),
+    .enableExperimentalFeature("StrictConcurrency"),
+    .enableExperimentalFeature("GlobalConcurrency"),
+    .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),
+    ]
+)

Package@swift-5.9.swift

@@ -9,7 +9,7 @@ let swiftSettings: Array<SwiftSetting> = [
     .enableUpcomingFeature("BareSlashRegexLiterals"),
     .enableUpcomingFeature("DisableOutwardActorInference"),
     .enableExperimentalFeature("StrictConcurrency"),
-//    .enableExperimentalFeature("AccessLevelOnImport"),
+    .enableExperimentalFeature("AccessLevelOnImport"),
 //    .enableExperimentalFeature("VariadicGenerics"),
 ]
 

Sources/AuthScope/Scope+CustomStringConvertible.swift

@@ -7,3 +7,8 @@ extension Scope: CustomStringConvertible, CustomDebugStringConvertible {
         "Scope<\(AccessRange.self)> { \(accessRanges.lazy.map(\.rawValue).sorted().joined(separator: ", ")) }"
     }
 }
+
+#if swift(>=6.0)
+@DebugDescription
+extension Scope {}
+#endif