Skip to content

Commit 083e4fc

Browse files
committed
Merge branch 'develop'
2 parents 1e3faf7 + f3f1f12 commit 083e4fc

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

.github/workflows/swift.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,28 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
image:
16-
- swift:5.2.5-xenial
17-
- swift:5.3.2-xenial
18-
- swift:5.3.2-bionic
19-
- swift:5.5.0-focal
16+
- swift:5.5.3-xenial
17+
- swift:5.6.1-bionic
18+
- swift:5.7.2-focal
2019
container: ${{ matrix.image }}
2120
steps:
2221
- name: Checkout Repository
23-
uses: actions/checkout@v2
22+
uses: actions/checkout@v3
2423
- name: Build Swift Debug Package
2524
run: swift build -c debug
2625
- name: Build Swift Release Package
2726
run: swift build -c release
2827
- name: Run Tests
29-
run: swift test
28+
run: swift test --enable-test-discovery
3029
nextstep:
3130
runs-on: macos-latest
3231
steps:
3332
- name: Select latest available Xcode
34-
uses: maxim-lobanov/setup-xcode@v1.2.1
33+
uses: maxim-lobanov/setup-xcode@v1.5.1
3534
with:
36-
xcode-version: 13
35+
xcode-version: 13.2.1
3736
- name: Checkout Repository
38-
uses: actions/checkout@v2
37+
uses: actions/checkout@v3
3938
- name: Build Swift Debug Package
4039
run: swift build -c debug
4140
- name: Build Swift Release Package

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,5 @@ Package.resolved
9494
xcuserdata
9595
.docker.build
9696
.swiftpm
97+
.vscode
9798

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.2
1+
// swift-tools-version:5.5
22

33
import PackageDescription
44

@@ -16,9 +16,9 @@ let package = Package(
1616

1717
dependencies: [
1818
.package(url: "https://github.com/Macro-swift/Macro.git",
19-
from: "0.8.11"),
19+
from: "1.0.0"),
2020
.package(url: "https://github.com/Macro-swift/MacroExpress.git",
21-
from: "0.8.8")
21+
from: "1.0.0")
2222
],
2323

2424
targets: [

Tests/LinuxMain.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
import XCTest
2-
import MacroAppTests
32

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

0 commit comments

Comments
 (0)