Skip to content

Commit 41861db

Browse files
authored
Merge pull request #63 from taji-taji/macos13
Support macOS13
2 parents 6439049 + acf9da6 commit 41861db

File tree

5 files changed

+168
-186
lines changed

5 files changed

+168
-186
lines changed

.github/workflows/danger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
danger:
8-
runs-on: macos-latest
8+
runs-on: macos-13
99
steps:
1010
- name: Checkout
1111
uses: actions/checkout@v3

.github/workflows/test.yml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,10 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
xcode: ["14.2", "14.1", "14.0.1", "13.4.1", "13.3.1", "13.2.1"]
14+
xcode: ["14.3.1"]
1515
include:
16-
- xcode: "14.2"
17-
macos: macos-12
18-
- xcode: "14.1"
19-
macos: macos-12
20-
- xcode: "14.0.1"
21-
macos: macos-12
22-
- xcode: "13.4.1"
23-
macos: macos-12
24-
- xcode: "13.3.1"
25-
macos: macos-12
26-
- xcode: "13.2.1"
27-
macos: macos-12
16+
- xcode: "14.3.1"
17+
macos: macos-13
2818
runs-on: ${{ matrix.macos }}
2919
name: macOS
3020
steps:
@@ -67,17 +57,11 @@ jobs:
6757
strategy:
6858
fail-fast: false
6959
matrix:
70-
swift: ["5.7", "5.6", "5.5"]
60+
swift: ["5.8"]
7161
include:
72-
- swift: "5.7"
73-
container: "swift:5.7"
62+
- swift: "5.8"
63+
container: "swift:5.8"
7464
cache-version: 1
75-
- swift: "5.6"
76-
container: "swift:5.6"
77-
cache-version: 2
78-
- swift: "5.5"
79-
container: "swift:5.5"
80-
cache-version: 2
8165
runs-on: ubuntu-latest
8266
container: ${{ matrix.container }}
8367
name: Linux

Package.resolved

Lines changed: 156 additions & 149 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.5
1+
// swift-tools-version:5.8
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
@@ -21,20 +21,10 @@ let developTargets: [Target] = isDevelop ? [
2121
dependencies: ["DangerSwiftPeriphery"]),
2222
] : []
2323

24-
#if compiler(>=5.7)
25-
let dependencies: [Package.Dependency] = [
26-
.package(url: "https://github.com/peripheryapp/periphery", from: "2.10.3"),
27-
]
28-
#else
29-
let dependencies: [Package.Dependency] = [
30-
.package(url: "https://github.com/peripheryapp/periphery", "2.0.0" ..< "2.10.0"),
31-
]
32-
#endif
33-
3424
let package = Package(
3525
name: "DangerSwiftPeriphery",
3626
platforms: [
37-
.macOS(.v12),
27+
.macOS(.v13),
3828
],
3929
products: [
4030
.library(
@@ -44,7 +34,8 @@ let package = Package(
4434
dependencies: [
4535
.package(url: "https://github.com/danger/swift.git", from: "3.0.0"),
4636
.package(url: "https://github.com/taji-taji/swift-shell.git", from: "1.0.0"),
47-
] + dependencies,
37+
.package(url: "https://github.com/peripheryapp/periphery", from: "2.15.0"),
38+
],
4839
targets: [
4940
.target(
5041
name: "DangerSwiftPeriphery",

0 commit comments

Comments
 (0)