Skip to content

Commit 60b03eb

Browse files
committed
Fix PackageConfig dep
1 parent cf45aa8 commit 60b03eb

File tree

4 files changed

+57
-24
lines changed

4 files changed

+57
-24
lines changed

Package.resolved

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@
1919
"version": "4.0.2"
2020
}
2121
},
22+
{
23+
"package": "Komondor",
24+
"repositoryURL": "https://github.com/shibapm/Komondor.git",
25+
"state": {
26+
"branch": null,
27+
"revision": "3cd6d76887816ead5931ddbfb249c2935f518e17",
28+
"version": "1.0.4"
29+
}
30+
},
2231
{
2332
"package": "Logger",
2433
"repositoryURL": "https://github.com/f-meloni/Logger",
@@ -48,11 +57,11 @@
4857
},
4958
{
5059
"package": "PackageConfig",
51-
"repositoryURL": "https://github.com/shibapm/PackageConfig.git",
60+
"repositoryURL": "https://github.com/minuscorp/PackageConfig",
5261
"state": {
53-
"branch": null,
54-
"revision": "dcd1765c100d08d88a4a23c9414150fac6fb10dd",
55-
"version": "0.12.0"
62+
"branch": "master",
63+
"revision": "47efdb5d59dc94c4d8ebc11ebe8edcae1f4dca1c",
64+
"version": null
5665
}
5766
},
5867
{
@@ -100,6 +109,15 @@
100109
"version": "5.0.1"
101110
}
102111
},
112+
{
113+
"package": "ShellOut",
114+
"repositoryURL": "https://github.com/JohnSundell/ShellOut.git",
115+
"state": {
116+
"branch": null,
117+
"revision": "d3d54ce662dfee7fef619330b71d251b8d4869f9",
118+
"version": "2.2.0"
119+
}
120+
},
103121
{
104122
"package": "SourceDocs",
105123
"repositoryURL": "https://github.com/eneko/SourceDocs",

Package.swift

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
// swift-tools-version:5.1
1+
// swift-tools-version:4.2
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
55

66
let package = Package(
77
name: "Mini",
8-
platforms: [
9-
.iOS(.v11),
10-
.macOS(.v10_13),
11-
.tvOS(.v11)
12-
],
8+
// platforms: [
9+
// .iOS(.v11),
10+
// .macOS(.v10_13),
11+
// .tvOS(.v11)
12+
// ],
1313
products: [
1414
// Products define the executables and libraries produced by a package, and make them visible to other packages.
1515
.library(
@@ -23,7 +23,7 @@ let package = Package(
2323
.library(
2424
name: "Mini/Test",
2525
targets: ["Mini", "TestMiddleware"]
26-
)
26+
),
2727
],
2828
dependencies: [
2929
// Dependencies declare other packages that this package depends on.
@@ -35,7 +35,9 @@ let package = Package(
3535
.package(url: "https://github.com/jpsim/SourceKitten", .exact("0.25.0")), // dev
3636
.package(url: "https://github.com/shibapm/Rocket", from: "0.4.0"), // dev
3737
.package(url: "https://github.com/Realm/SwiftLint", from: "0.35.0"), // dev
38-
.package(url: "https://github.com/eneko/SourceDocs", from: "0.5.1") // dev
38+
.package(url: "https://github.com/eneko/SourceDocs", from: "0.5.1"), // dev
39+
.package(url: "https://github.com/minuscorp/PackageConfig", .branch("master")),
40+
.package(url: "https://github.com/shibapm/Komondor.git", from: "1.0.0"),
3941
],
4042
targets: [
4143
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -52,7 +54,7 @@ let package = Package(
5254
name: "TestMiddleware",
5355
dependencies: ["Mini"]
5456
),
55-
.testTarget(name: "MiniSwiftTests",dependencies: ["Mini", "TestMiddleware", "NIOConcurrencyHelpers", "RxSwift", "Nimble", "RxTest", "RxBlocking"]) // dev
57+
.testTarget(name: "MiniSwiftTests", dependencies: ["Mini", "TestMiddleware", "NIOConcurrencyHelpers", "RxSwift", "Nimble", "RxTest", "RxBlocking"]), // dev
5658
],
5759
swiftLanguageVersions: [.version("4"), .version("4.2"), .version("5")]
5860
)
@@ -67,5 +69,15 @@ let package = Package(
6769
"Scripts/update_changelog.sh",
6870
],
6971
],
72+
"komondor": [
73+
"pre-push": "swift test",
74+
"pre-commit": [
75+
"swift test",
76+
"swift test --generate-linuxmain",
77+
"swift run swiftformat .",
78+
"swift run swiftlint autocorrect --path Sources/",
79+
"git add .",
80+
],
81+
],
7082
]).write()
7183
#endif

Tests/MiniSwiftTests/RxTests/ObservableTypeTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ final class ObservableTypeTests: XCTestCase {
4444
.next(10, 10),
4545
.next(20, 20),
4646
.next(30, 30),
47-
.completed(40)
47+
.completed(40),
4848
]
4949
)
5050
.filterOne { $0 == 20 }
@@ -55,7 +55,7 @@ final class ObservableTypeTests: XCTestCase {
5555

5656
XCTAssertEqual(filterOneObserver.events, [
5757
.next(20, 20),
58-
.completed(20)
58+
.completed(20),
5959
])
6060
}
6161

Tests/MiniSwiftTests/XCTestManifests.swift

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// `swift test --generate-linuxmain`
77
// to regenerate.
88
static let __allTests__ChainTests = [
9-
("test_forwarding_chain_forwards_action", test_forwarding_chain_forwards_action)
9+
("test_forwarding_chain_forwards_action", test_forwarding_chain_forwards_action),
1010
]
1111
}
1212

@@ -16,7 +16,7 @@
1616
// to regenerate.
1717
static let __allTests__DictionaryExtensionsTests = [
1818
("test_get_or_put", test_get_or_put),
19-
("test_unrapping_subscript", test_unrapping_subscript)
19+
("test_unrapping_subscript", test_unrapping_subscript),
2020
]
2121
}
2222

@@ -25,7 +25,7 @@
2525
// `swift test --generate-linuxmain`
2626
// to regenerate.
2727
static let __allTests__DispatchQueueTests = [
28-
("test_main_queue", test_main_queue)
28+
("test_main_queue", test_main_queue),
2929
]
3030
}
3131

@@ -36,7 +36,7 @@
3636
static let __allTests__DispatcherTests = [
3737
("test_add_remove_middleware", test_add_remove_middleware),
3838
("test_add_remove_service", test_add_remove_service),
39-
("test_subscription_count", test_subscription_count)
39+
("test_subscription_count", test_subscription_count),
4040
]
4141
}
4242

@@ -47,7 +47,7 @@
4747
static let __allTests__ObservableTypeTests = [
4848
("test_dispatch_action_from_store", test_dispatch_action_from_store),
4949
("test_dispatch_hashable_action_from_store", test_dispatch_hashable_action_from_store),
50-
("test_filter_one", test_filter_one)
50+
("test_filter_one", test_filter_one),
5151
]
5252
}
5353

@@ -59,8 +59,10 @@
5959
("test_completable_action_action", test_completable_action_action),
6060
("test_completable_action_dispatch", test_completable_action_dispatch),
6161
("test_completable_action_dispatch_error", test_completable_action_dispatch_error),
62+
("test_empty_action_dispatch", test_empty_action_dispatch),
63+
("test_empty_action_dispatch_error", test_empty_action_dispatch_error),
6264
("test_keyed_completable_action_dispatch", test_keyed_completable_action_dispatch),
63-
("test_keyed_completable_action_dispatch_error", test_keyed_completable_action_dispatch_error)
65+
("test_keyed_completable_action_dispatch_error", test_keyed_completable_action_dispatch_error),
6466
]
6567
}
6668

@@ -69,6 +71,7 @@
6971
// `swift test --generate-linuxmain`
7072
// to regenerate.
7173
static let __allTests__PromiseTests = [
74+
("test_equality_completed", test_equality_completed),
7275
("test_equality_error", test_equality_error),
7376
("test_equality_pending", test_equality_pending),
7477
("test_equality_with_value", test_equality_with_value),
@@ -79,7 +82,7 @@
7982
("test_is_rejected", test_is_rejected),
8083
("test_is_resolved", test_is_resolved),
8184
("test_promise_properties", test_promise_properties),
82-
("test_reject", test_reject)
85+
("test_reject", test_reject),
8386
]
8487
}
8588

@@ -93,7 +96,7 @@
9396
("test_reset_state", test_reset_state),
9497
("test_state_received_in_store", test_state_received_in_store),
9598
("test_subscribe_to_store_receive_actions", test_subscribe_to_store_receive_actions),
96-
("test_subscribe_to_store_receive_multiple_actions", test_subscribe_to_store_receive_multiple_actions)
99+
("test_subscribe_to_store_receive_multiple_actions", test_subscribe_to_store_receive_multiple_actions),
97100
]
98101
}
99102

@@ -106,7 +109,7 @@
106109
testCase(ObservableTypeTests.__allTests__ObservableTypeTests),
107110
testCase(PrimitiveSequenceTypeTests.__allTests__PrimitiveSequenceTypeTests),
108111
testCase(PromiseTests.__allTests__PromiseTests),
109-
testCase(ReducerTests.__allTests__ReducerTests)
112+
testCase(ReducerTests.__allTests__ReducerTests),
110113
]
111114
}
112115
#endif

0 commit comments

Comments
 (0)