Skip to content

Commit

Permalink
Add Swift 5.6 support
Browse files Browse the repository at this point in the history
  • Loading branch information
ffried committed Mar 17, 2022
1 parent c60374f commit 31b1785
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 75 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/swift-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
strategy:
matrix:
os: [ macos-11, ubuntu-20.04 ]
swift-version: [ 5.4 ]
swift-version: [ 5.5, 5.6 ]

runs-on: ${{matrix.os}}

steps:
- 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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

# Project & Source files
*.swift @ffried
/Package.* @ffried
/Package*.swift @ffried
/Sources/* @ffried
/Tests/* @ffried
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -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
Expand Down
22 changes: 0 additions & 22 deletions Package@swift-5.4.swift

This file was deleted.

2 changes: 1 addition & 1 deletion Package@swift-5.3.swift → Package@swift-5.5.swift
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 4 additions & 0 deletions Sources/AppInformation/Model/AppInfo+AppleID.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,7 @@ extension AppInfo {
}
}
}

#if compiler(>=5.5.2) && canImport(_Concurrency)
extension AppInfo.AppleID: Sendable {}
#endif
6 changes: 6 additions & 0 deletions Sources/AppInformation/Model/AppInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
38 changes: 0 additions & 38 deletions Tests/AppInformationTests/XCTestManifests.swift

This file was deleted.

8 changes: 0 additions & 8 deletions Tests/LinuxMain.swift

This file was deleted.

0 comments on commit 31b1785

Please sign in to comment.