Skip to content

Commit d1baa4d

Browse files
authored
Merge pull request #17 from PromiseKit/fix-xcode-13
Fix Xcode 13 builds
2 parents e26f6a5 + 7d80fb5 commit d1baa4d

File tree

5 files changed

+60
-7
lines changed

5 files changed

+60
-7
lines changed

.github/workflows/ci.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: CI
2+
on:
3+
pull_request:
4+
jobs:
5+
build:
6+
runs-on: ${{ matrix.xcode == '11' && 'macos-10.15' || 'macos-11' }}
7+
strategy:
8+
matrix:
9+
platform:
10+
- macOS
11+
- tvOS
12+
- iOS
13+
- watchOS
14+
xcode:
15+
- 11
16+
- 12
17+
- 13
18+
steps:
19+
- uses: actions/checkout@v2
20+
- run: rm -rf PMKStoreKit.xcodeproj
21+
- uses: mxcl/xcodebuild@v1
22+
with:
23+
xcode: ${{ matrix.xcode }}
24+
platform: ${{ matrix.platform }}
25+
action: build

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
*.xcscmblueprint
33
/Carthage
44
/.build
5-
.DS_Store
5+
.DS_Store
6+
/Package.resolved

Package.swift

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.0
22
import PackageDescription
33

44
let name = "PMKStoreKit"
55

66
let pkg = Package(name: name)
7+
pkg.platforms = [
8+
.watchOS("6.2")
9+
]
710
pkg.products = [
8-
.library(name: name, targets: [name]),
11+
.library(name: name, targets: [name]),
912
]
10-
pkg.swiftLanguageVersions = [3, 4]
13+
pkg.swiftLanguageVersions = [.v4, .v5]
1114
pkg.dependencies = [
12-
.package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.0.0")
15+
.package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.0.0")
1316
]
1417

1518
let target: Target = .target(name: name)
1619
target.path = "Sources"
1720
target.exclude = [
1821
"SKRequest+AnyPromise.h",
19-
"SKRequest+AnyPromise.m",
20-
"\(name).h",
22+
"SKRequest+AnyPromise.m",
23+
"\(name).h",
2124
]
2225
target.dependencies = ["PromiseKit"]
2326

Package@swift-4.0.swift

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// swift-tools-version:4.0
2+
import PackageDescription
3+
4+
let name = "PMKStoreKit"
5+
6+
let pkg = Package(name: name)
7+
pkg.products = [
8+
.library(name: name, targets: [name]),
9+
]
10+
pkg.swiftLanguageVersions = [3, 4]
11+
pkg.dependencies = [
12+
.package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.0.0")
13+
]
14+
15+
let target: Target = .target(name: name)
16+
target.path = "Sources"
17+
target.exclude = [
18+
"SKRequest+AnyPromise.h",
19+
"SKRequest+AnyPromise.m",
20+
"\(name).h",
21+
]
22+
target.dependencies = ["PromiseKit"]
23+
24+
pkg.targets = [target]

0 commit comments

Comments
 (0)