Skip to content

Commit

Permalink
Update to latest versions
Browse files Browse the repository at this point in the history
Use Macro 1.0.0 / MacroExpress 1.0.0.
This bumps SwiftNIO to the latest, but also bumps
the Swift requirement to 5.5.2+.
  • Loading branch information
helje5 committed Jan 2, 2023
1 parent 21d8f09 commit f3f1f12
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 16 deletions.
17 changes: 8 additions & 9 deletions .github/workflows/swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,28 @@ jobs:
fail-fast: false
matrix:
image:
- swift:5.2.5-xenial
- swift:5.3.2-xenial
- swift:5.3.2-bionic
- swift:5.5.0-focal
- swift:5.5.3-xenial
- swift:5.6.1-bionic
- swift:5.7.2-focal
container: ${{ matrix.image }}
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build Swift Debug Package
run: swift build -c debug
- name: Build Swift Release Package
run: swift build -c release
- name: Run Tests
run: swift test
run: swift test --enable-test-discovery
nextstep:
runs-on: macos-latest
steps:
- name: Select latest available Xcode
uses: maxim-lobanov/setup-xcode@v1.2.1
uses: maxim-lobanov/setup-xcode@v1.5.1
with:
xcode-version: 13
xcode-version: 13.2.1
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build Swift Debug Package
run: swift build -c debug
- name: Build Swift Release Package
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,5 @@ Package.resolved
xcuserdata
.docker.build
.swiftpm
.vscode

6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.2
// swift-tools-version:5.5

import PackageDescription

Expand All @@ -16,9 +16,9 @@ let package = Package(

dependencies: [
.package(url: "https://github.com/Macro-swift/Macro.git",
from: "0.8.11"),
from: "1.0.0"),
.package(url: "https://github.com/Macro-swift/MacroExpress.git",
from: "0.8.8")
from: "1.0.0")
],

targets: [
Expand Down
5 changes: 1 addition & 4 deletions Tests/LinuxMain.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import XCTest
import MacroAppTests

var tests = [ XCTestCaseEntry ]()
tests += MacroAppTests.allTests()
XCTMain(tests)
#error("Swift 5.5 requires --enable-test-discovery")

0 comments on commit f3f1f12

Please sign in to comment.