Skip to content

Commit 6fa038a

Browse files
authored
Merge pull request #6 from pawello2222/dev
Release 0.2.0
2 parents 3278934 + fd16e55 commit 6fa038a

File tree

119 files changed

+354
-396
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+354
-396
lines changed

.github/workflows/build.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,29 @@ on:
66
pull_request:
77
branches: [ main ]
88

9+
env:
10+
DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
11+
12+
SCHEME: PhantomKit
13+
IOS_SDK: iphonesimulator
14+
IOS_DESTINATION: "platform=iOS Simulator,name=iPhone 13 Pro,OS=latest"
15+
916
jobs:
10-
build:
11-
runs-on: macos-latest
17+
build-test:
18+
runs-on: macos-11
19+
1220
steps:
13-
- uses: actions/checkout@v2
14-
- name: Build and Test
15-
run: xcodebuild test -scheme PhantomKit -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 12 Pro' -enableCodeCoverage YES build test
16-
- name: Codecov
17-
uses: codecov/[email protected]
21+
- name: Checkout
22+
uses: actions/checkout@v2
23+
- name: Build and Test
24+
run: |
25+
set -o pipefail
26+
xcodebuild clean build test \
27+
-scheme "$SCHEME" \
28+
-sdk "$IOS_SDK" \
29+
-destination "$IOS_DESTINATION" \
30+
-enableCodeCoverage YES | xcpretty -c
31+
- name: Codecov
32+
uses: codecov/codecov-action@v1
33+
with:
34+
fail_ci_if_error: true

.github/workflows/lint.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: lint
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
jobs:
10+
swiftlint:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: SwiftLint
15+
uses: norio-nomura/[email protected]

.github/workflows/swiftlint.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.swiftlint.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
excluded:
2+
- .build
3+
14
disabled_rules:
25
- nesting
36
- trailing_comma

Package.resolved

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
{
22
"object": {
33
"pins": [
4+
{
5+
"package": "AnyCodable",
6+
"repositoryURL": "https://github.com/Flight-School/AnyCodable",
7+
"state": {
8+
"branch": null,
9+
"revision": "b1a7a8a6186f2fcb28f7bda67cfc545de48b3c80",
10+
"version": "0.6.2"
11+
}
12+
},
413
{
514
"package": "Async",
615
"repositoryURL": "https://github.com/duemunk/Async",
@@ -50,9 +59,9 @@
5059
"package": "Xcore",
5160
"repositoryURL": "https://github.com/pawello2222/xcore.git",
5261
"state": {
53-
"branch": null,
54-
"revision": "08b154f297154d95f0f7a5196c8b02dd339f83cf",
55-
"version": "1.0.1"
62+
"branch": "main",
63+
"revision": "d3018987345ea80b92f768ed5516828e48b3cc32",
64+
"version": null
5665
}
5766
}
5867
]

Package.swift

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,29 @@
1-
// swift-tools-version:5.3
1+
// swift-tools-version:5.5
22

33
import PackageDescription
44

5-
// MARK: - Dependencies
6-
7-
let depencencies: [Package.Dependency] = [
8-
.package(url: "https://github.com/duemunk/Async", .upToNextMajor(from: "2.1.0")),
9-
.package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "9.0.0")),
10-
.package(name: "Xcore", url: "https://github.com/pawello2222/xcore.git", .upToNextMajor(from: "1.0.0")),
11-
]
12-
13-
// MARK: - Targets
14-
15-
let targets: [Target] = [
16-
.target(name: "PhantomKit", dependencies: ["Async", "Xcore"], path: "Sources"),
17-
.testTarget(name: "PhantomKitTests", dependencies: ["PhantomKit", "Nimble"], path: "Tests"),
18-
]
19-
20-
// MARK: - Package
21-
225
let package = Package(
236
name: "PhantomKit",
247
defaultLocalization: "en",
25-
platforms: [.iOS(.v14), .macOS(.v11)],
8+
platforms: [.iOS(.v14)],
269
products: [
2710
.library(name: "PhantomKit", targets: ["PhantomKit"]),
2811
],
29-
dependencies: depencencies,
30-
targets: targets,
12+
dependencies: [
13+
.package(url: "https://github.com/duemunk/Async", .upToNextMajor(from: "2.1.0")),
14+
.package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "9.0.0")),
15+
.package(name: "Xcore", url: "https://github.com/pawello2222/xcore.git", .branch("main")),
16+
],
17+
targets: [
18+
.target(
19+
name: "PhantomKit",
20+
dependencies: ["Async", "Xcore"]
21+
),
22+
.testTarget(
23+
name: "PhantomKitTests",
24+
dependencies: ["PhantomKit", "Nimble"],
25+
exclude: ["Resources/Info.plist"]
26+
),
27+
],
3128
swiftLanguageVersions: [.v5]
3229
)

0 commit comments

Comments
 (0)