diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fda23b0..4fad049 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,13 @@ jobs: - uses: maxim-lobanov/setup-xcode@v1.4.1 if: runner.os == 'macOS' with: - xcode-version: ^12.4 + xcode-version: ^13.0 + - name: Install Swift + if: runner.os == 'Linux' + uses: sersoft-gmbh/swifty-linux-action@v1.3.0 + with: + release-version: 5.6 + github-token: ${{secrets.GITHUB_TOKEN}} - name: Read OS Version uses: sersoft-gmbh/os-version-action@v1.0.0 id: os-version diff --git a/.github/workflows/swift-test.yml b/.github/workflows/swift-test.yml index a815cfa..1a98e3a 100644 --- a/.github/workflows/swift-test.yml +++ b/.github/workflows/swift-test.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [ macos-11, ubuntu-20.04 ] - swift-version: [ 5.4 ] + swift-version: [ 5.5, 5.6 ] runs-on: ${{matrix.os}} @@ -19,7 +19,7 @@ jobs: - if: runner.os == 'macOS' uses: maxim-lobanov/setup-xcode@v1.4.1 with: - xcode-version: ^12.4 + xcode-version: ^13.0 - name: Install Swift if: runner.os == 'Linux' uses: sersoft-gmbh/swifty-linux-action@v1.3.0 @@ -74,7 +74,7 @@ jobs: steps: - uses: maxim-lobanov/setup-xcode@v1.4.1 with: - xcode-version: ^12.4 + xcode-version: ^13.0 - uses: actions/checkout@v3.0.0 - uses: sersoft-gmbh/xcodebuild-action@v1.8.0 with: diff --git a/CODEOWNERS b/CODEOWNERS index 9a79490..76e25c7 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -8,6 +8,6 @@ # Project & Source files *.swift @ffried -/Package.* @ffried +/Package*.swift @ffried /Sources/* @ffried /Tests/* @ffried diff --git a/Package.swift b/Package.swift index a5fac54..aae8a2d 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.5 +// swift-tools-version:5.6 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription diff --git a/Package@swift-5.4.swift b/Package@swift-5.4.swift deleted file mode 100644 index 8006004..0000000 --- a/Package@swift-5.4.swift +++ /dev/null @@ -1,22 +0,0 @@ -// swift-tools-version:5.4 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -import PackageDescription - -let package = Package( - name: "app-information", - products: [ - // Products define the executables and libraries a package produces, and make them visible to other packages. - .library( - name: "AppInformation", - targets: ["AppInformation"]), - ], - 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 this package depends on. - .target(name: "AppInformation"), - .testTarget( - name: "AppInformationTests", - dependencies: ["AppInformation"]), - ] -) diff --git a/Package@swift-5.3.swift b/Package@swift-5.5.swift similarity index 96% rename from Package@swift-5.3.swift rename to Package@swift-5.5.swift index b3afd23..a5fac54 100644 --- a/Package@swift-5.3.swift +++ b/Package@swift-5.5.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.5 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription diff --git a/Sources/AppInformation/Model/AppInfo+AppleID.swift b/Sources/AppInformation/Model/AppInfo+AppleID.swift index 45e0be5..3441e30 100644 --- a/Sources/AppInformation/Model/AppInfo+AppleID.swift +++ b/Sources/AppInformation/Model/AppInfo+AppleID.swift @@ -43,3 +43,7 @@ extension AppInfo { } } } + +#if compiler(>=5.5.2) && canImport(_Concurrency) +extension AppInfo.AppleID: Sendable {} +#endif diff --git a/Sources/AppInformation/Model/AppInfo.swift b/Sources/AppInformation/Model/AppInfo.swift index b5d6c81..eb98fb0 100644 --- a/Sources/AppInformation/Model/AppInfo.swift +++ b/Sources/AppInformation/Model/AppInfo.swift @@ -146,3 +146,9 @@ extension EnvironmentValues { } #endif #endif + +#if compiler(>=5.5.2) && canImport(_Concurrency) +extension AppInfo: Sendable {} +extension AppInfo.Naming: Sendable {} +extension AppInfo.Versioning: Sendable {} +#endif diff --git a/Tests/AppInformationTests/XCTestManifests.swift b/Tests/AppInformationTests/XCTestManifests.swift deleted file mode 100644 index e940a48..0000000 --- a/Tests/AppInformationTests/XCTestManifests.swift +++ /dev/null @@ -1,38 +0,0 @@ -#if !canImport(ObjectiveC) -import XCTest - -extension AppInfoTests { - // DO NOT MODIFY: This is autogenerated, use: - // `swift test --generate-linuxmain` - // to regenerate. - static let __allTests__AppInfoTests = [ - ("testCreationFromEmptyBundle", testCreationFromEmptyBundle), - ("testCreationFromEmptyBundleAndAppleID", testCreationFromEmptyBundleAndAppleID), - ("testCreationFromLocalizedBundle", testCreationFromLocalizedBundle), - ("testCreationFromUnlocalizedBundle", testCreationFromUnlocalizedBundle), - ("testIdentifiableConformance", testIdentifiableConformance), - ("testNamingAccessors", testNamingAccessors), - ("testNamingEquatableConformance", testNamingEquatableConformance), - ("testSwiftUIEnvironment", testSwiftUIEnvironment), - ("testVersioningAccessors", testVersioningAccessors), - ] -} - -extension AppInfo_AppleIDTests { - // DO NOT MODIFY: This is autogenerated, use: - // `swift test --generate-linuxmain` - // to regenerate. - static let __allTests__AppInfo_AppleIDTests = [ - ("testCreation", testCreation), - ("testCreationFromStringLiteral", testCreationFromStringLiteral), - ("testURLAccessors", testURLAccessors), - ] -} - -public func __allTests() -> [XCTestCaseEntry] { - return [ - testCase(AppInfoTests.__allTests__AppInfoTests), - testCase(AppInfo_AppleIDTests.__allTests__AppInfo_AppleIDTests), - ] -} -#endif diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift deleted file mode 100644 index 6b73f74..0000000 --- a/Tests/LinuxMain.swift +++ /dev/null @@ -1,8 +0,0 @@ -import XCTest - -import AppInformationTests - -var tests = [XCTestCaseEntry]() -tests += AppInformationTests.__allTests() - -XCTMain(tests)