Skip to content

Commit 4ed52e2

Browse files
committed
iOS13+
1 parent 18564c0 commit 4ed52e2

File tree

9 files changed

+117
-123
lines changed

9 files changed

+117
-123
lines changed

.github/workflows/build.yml

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ on:
66
workflow_dispatch:
77

88
jobs:
9-
xcode_15_1:
10-
runs-on: macos-13
9+
xcode_15_3:
10+
runs-on: macos-14
1111
env:
12-
DEVELOPER_DIR: /Applications/Xcode_15.1.app/Contents/Developer
12+
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
- name: Version
1717
run: swift --version
1818
- name: Build
@@ -22,17 +22,31 @@ jobs:
2222
- name: Gather code coverage
2323
run: xcrun llvm-cov export -format="lcov" .build/debug/SwiftDrawPackageTests.xctest/Contents/MacOS/SwiftDrawPackageTests -instr-profile .build/debug/codecov/default.profdata > coverage_report.lcov
2424
- name: Upload Coverage
25-
uses: codecov/codecov-action@v3
25+
uses: codecov/codecov-action@v4
2626
with:
2727
files: ./coverage_report.lcov
2828

29+
xcode_15_2:
30+
runs-on: macos-14
31+
env:
32+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
33+
steps:
34+
- name: Checkout
35+
uses: actions/checkout@v4
36+
- name: Version
37+
run: swift --version
38+
- name: Build
39+
run: swift build --build-tests
40+
- name: Test
41+
run: swift test --skip-build
42+
2943
xcode_14_3:
3044
runs-on: macos-13
3145
env:
3246
DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
3347
steps:
3448
- name: Checkout
35-
uses: actions/checkout@v3
49+
uses: actions/checkout@v4
3650
- name: Version
3751
run: swift --version
3852
- name: Build
@@ -45,7 +59,7 @@ jobs:
4559
container: swift:5.7
4660
steps:
4761
- name: Checkout
48-
uses: actions/checkout@v3
62+
uses: actions/checkout@v4
4963
- name: Version
5064
run: swift --version
5165
- name: Build
@@ -58,7 +72,20 @@ jobs:
5872
container: swift:5.9
5973
steps:
6074
- name: Checkout
61-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
76+
- name: Version
77+
run: swift --version
78+
- name: Build
79+
run: swift build --build-tests
80+
- name: Test
81+
run: swift test --skip-build
82+
83+
linux_5_10:
84+
runs-on: ubuntu-latest
85+
container: swift:5.10
86+
steps:
87+
- name: Checkout
88+
uses: actions/checkout@v4
6289
- name: Version
6390
run: swift --version
6491
- name: Build

.swiftpm/SwiftDraw.xctestplan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"configurations" : [
33
{
4-
"id" : "1AF01B10-5ADB-4F60-8B2E-FB30A2CC2F79",
4+
"id" : "B46FBA9F-0EC4-486D-8336-66AB23577319",
55
"name" : "Test Scheme Action",
66
"options" : {
77

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55
let package = Package(
66
name: "SwiftDraw",
77
platforms: [
8-
.iOS(.v12), .macOS(.v10_14)
8+
.iOS(.v13), .macOS(.v10_15)
99
],
1010
products: [
1111
// Products define the executables and libraries produced by a package, and make them visible to other packages.

SwiftDraw/CommandLine.Configuration.swift

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,10 @@ extension CommandLine {
180180
}
181181

182182
let scanner = Scanner(string: value)
183-
var width: Int32 = 0
184-
var height: Int32 = 0
185183
guard
186-
scanner.scanInt32(&width),
187-
scanner.scanString("x", into: nil),
188-
scanner.scanInt32(&height),
184+
let width = scanner.scanInt32(),
185+
let _ = scanner.scanString("x"),
186+
let height = scanner.scanInt32(),
189187
width > 0, height > 0 else {
190188
throw Error.invalid
191189
}

0 commit comments

Comments
 (0)