Skip to content

Commit

Permalink
Swift Language Support: Drop <5.9, Add 6.0 (#73)
Browse files Browse the repository at this point in the history
* Swift Language Support: Drop <5.9, Add 6.0

* wip

* wip
  • Loading branch information
stephencelis authored Jun 18, 2024
1 parent e495595 commit 1399ff5
Show file tree
Hide file tree
Showing 9 changed files with 214 additions and 287 deletions.
27 changes: 18 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,26 @@ on:

jobs:
build:
name: MacOS
runs-on: macOS-latest
name: macOS
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Select Xcode
run: sudo xcode-select -s /Applications/Xcode_15.4.app
- name: Run tests
run: make test-swift
run: swift test

ubuntu:
name: Ubuntu
linux:
strategy:
matrix:
swift:
- '5.10'
name: Linux (Swift ${{ matrix.swift }})
runs-on: ubuntu-latest
container: swift:${{ matrix.swift }}
steps:
- uses: actions/checkout@v2
- name: Run tests
run: make test-linux
- uses: actions/checkout@v4
- name: Run tests
run: swift test --parallel
- name: Run tests (release)
run: swift test -c release --parallel
38 changes: 0 additions & 38 deletions Makefile

This file was deleted.

10 changes: 9 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// swift-tools-version:5.1
// swift-tools-version: 5.9

import Foundation
import PackageDescription

Expand All @@ -20,3 +21,10 @@ var package = Package(
.testTarget(name: "TaggedTimeTests", dependencies: ["TaggedTime"]),
]
)

for target in package.targets {
target.swiftSettings = target.swiftSettings ?? []
target.swiftSettings!.append(contentsOf: [
.enableExperimentalFeature("StrictConcurrency")
])
}
24 changes: 24 additions & 0 deletions [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// swift-tools-version: 6.0

import Foundation
import PackageDescription

var package = Package(
name: "swift-tagged",
products: [
.library(name: "Tagged", targets: ["Tagged"]),
.library(name: "TaggedMoney", targets: ["TaggedMoney"]),
.library(name: "TaggedTime", targets: ["TaggedTime"]),
],
targets: [
.target(name: "Tagged", dependencies: []),
.testTarget(name: "TaggedTests", dependencies: ["Tagged"]),

.target(name: "TaggedMoney", dependencies: ["Tagged"]),
.testTarget(name: "TaggedMoneyTests", dependencies: ["TaggedMoney"]),

.target(name: "TaggedTime", dependencies: ["Tagged"]),
.testTarget(name: "TaggedTimeTests", dependencies: ["TaggedTime"]),
],
swiftLanguageVersions: [.v6]
)
Loading

0 comments on commit 1399ff5

Please sign in to comment.