Fix PackageConfig dep

minuscorp · minuscorp · commit 60b03ebdbf77 · 2019-10-10T13:02:29.000+02:00
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,15 +1,15 @@
-// swift-tools-version:5.1
+// swift-tools-version:4.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "Mini",
-    platforms: [
-        .iOS(.v11),
-        .macOS(.v10_13),
-        .tvOS(.v11)
-    ],
+    //    platforms: [
+//        .iOS(.v11),
+//        .macOS(.v10_13),
+//        .tvOS(.v11)
+//    ],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
@@ -23,7 +23,7 @@ let package = Package(
         .library(
             name: "Mini/Test",
             targets: ["Mini", "TestMiddleware"]
-        )
+        ),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -35,7 +35,9 @@ let package = Package(
         .package(url: "https://github.com/jpsim/SourceKitten", .exact("0.25.0")), // dev
         .package(url: "https://github.com/shibapm/Rocket", from: "0.4.0"), // dev
         .package(url: "https://github.com/Realm/SwiftLint", from: "0.35.0"), // dev
-        .package(url: "https://github.com/eneko/SourceDocs", from: "0.5.1") // dev
+        .package(url: "https://github.com/eneko/SourceDocs", from: "0.5.1"), // dev
+        .package(url: "https://github.com/minuscorp/PackageConfig", .branch("master")),
+        .package(url: "https://github.com/shibapm/Komondor.git", from: "1.0.0"),
     ],
     targets: [
         // 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(
             name: "TestMiddleware",
             dependencies: ["Mini"]
         ),
-        .testTarget(name: "MiniSwiftTests",dependencies: ["Mini", "TestMiddleware", "NIOConcurrencyHelpers", "RxSwift", "Nimble", "RxTest", "RxBlocking"]) // dev
+        .testTarget(name: "MiniSwiftTests", dependencies: ["Mini", "TestMiddleware", "NIOConcurrencyHelpers", "RxSwift", "Nimble", "RxTest", "RxBlocking"]), // dev
     ],
     swiftLanguageVersions: [.version("4"), .version("4.2"), .version("5")]
 )
@@ -67,5 +69,15 @@ let package = Package(
                 "Scripts/update_changelog.sh",
             ],
         ],
+        "komondor": [
+            "pre-push": "swift test",
+            "pre-commit": [
+                "swift test",
+                "swift test --generate-linuxmain",
+                "swift run swiftformat .",
+                "swift run swiftlint autocorrect --path Sources/",
+                "git add .",
+            ],
+        ],
     ]).write()
 #endif
diff --git a/Tests/MiniSwiftTests/RxTests/ObservableTypeTests.swift b/Tests/MiniSwiftTests/RxTests/ObservableTypeTests.swift
@@ -44,7 +44,7 @@ final class ObservableTypeTests: XCTestCase {
                 .next(10, 10),
                 .next(20, 20),
                 .next(30, 30),
-                .completed(40)
+                .completed(40),
             ]
         )
         .filterOne { $0 == 20 }
@@ -55,7 +55,7 @@ final class ObservableTypeTests: XCTestCase {
 
         XCTAssertEqual(filterOneObserver.events, [
             .next(20, 20),
-            .completed(20)
+            .completed(20),
         ])
     }
 
diff --git a/Tests/MiniSwiftTests/XCTestManifests.swift b/Tests/MiniSwiftTests/XCTestManifests.swift
@@ -6,7 +6,7 @@
         //   `swift test --generate-linuxmain`
         // to regenerate.
         static let __allTests__ChainTests = [
-            ("test_forwarding_chain_forwards_action", test_forwarding_chain_forwards_action)
+            ("test_forwarding_chain_forwards_action", test_forwarding_chain_forwards_action),
         ]
     }
 
@@ -16,7 +16,7 @@
         // to regenerate.
         static let __allTests__DictionaryExtensionsTests = [
             ("test_get_or_put", test_get_or_put),
-            ("test_unrapping_subscript", test_unrapping_subscript)
+            ("test_unrapping_subscript", test_unrapping_subscript),
         ]
     }
 
@@ -25,7 +25,7 @@
         //   `swift test --generate-linuxmain`
         // to regenerate.
         static let __allTests__DispatchQueueTests = [
-            ("test_main_queue", test_main_queue)
+            ("test_main_queue", test_main_queue),
         ]
     }
 
@@ -36,7 +36,7 @@
         static let __allTests__DispatcherTests = [
             ("test_add_remove_middleware", test_add_remove_middleware),
             ("test_add_remove_service", test_add_remove_service),
-            ("test_subscription_count", test_subscription_count)
+            ("test_subscription_count", test_subscription_count),
         ]
     }
 
@@ -47,7 +47,7 @@
         static let __allTests__ObservableTypeTests = [
             ("test_dispatch_action_from_store", test_dispatch_action_from_store),
             ("test_dispatch_hashable_action_from_store", test_dispatch_hashable_action_from_store),
-            ("test_filter_one", test_filter_one)
+            ("test_filter_one", test_filter_one),
         ]
     }
 
@@ -59,8 +59,10 @@
             ("test_completable_action_action", test_completable_action_action),
             ("test_completable_action_dispatch", test_completable_action_dispatch),
             ("test_completable_action_dispatch_error", test_completable_action_dispatch_error),
+            ("test_empty_action_dispatch", test_empty_action_dispatch),
+            ("test_empty_action_dispatch_error", test_empty_action_dispatch_error),
             ("test_keyed_completable_action_dispatch", test_keyed_completable_action_dispatch),
-            ("test_keyed_completable_action_dispatch_error", test_keyed_completable_action_dispatch_error)
+            ("test_keyed_completable_action_dispatch_error", test_keyed_completable_action_dispatch_error),
         ]
     }
 
@@ -69,6 +71,7 @@
         //   `swift test --generate-linuxmain`
         // to regenerate.
         static let __allTests__PromiseTests = [
+            ("test_equality_completed", test_equality_completed),
             ("test_equality_error", test_equality_error),
             ("test_equality_pending", test_equality_pending),
             ("test_equality_with_value", test_equality_with_value),
@@ -79,7 +82,7 @@
             ("test_is_rejected", test_is_rejected),
             ("test_is_resolved", test_is_resolved),
             ("test_promise_properties", test_promise_properties),
-            ("test_reject", test_reject)
+            ("test_reject", test_reject),
         ]
     }
 
@@ -93,7 +96,7 @@
             ("test_reset_state", test_reset_state),
             ("test_state_received_in_store", test_state_received_in_store),
             ("test_subscribe_to_store_receive_actions", test_subscribe_to_store_receive_actions),
-            ("test_subscribe_to_store_receive_multiple_actions", test_subscribe_to_store_receive_multiple_actions)
+            ("test_subscribe_to_store_receive_multiple_actions", test_subscribe_to_store_receive_multiple_actions),
         ]
     }
 
@@ -106,7 +109,7 @@
             testCase(ObservableTypeTests.__allTests__ObservableTypeTests),
             testCase(PrimitiveSequenceTypeTests.__allTests__PrimitiveSequenceTypeTests),
             testCase(PromiseTests.__allTests__PromiseTests),
-            testCase(ReducerTests.__allTests__ReducerTests)
+            testCase(ReducerTests.__allTests__ReducerTests),
         ]
     }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ final class ObservableTypeTests: XCTestCase {`
`44`	`44`	`.next(10, 10),`
`45`	`45`	`.next(20, 20),`
`46`	`46`	`.next(30, 30),`
`47`		`- .completed(40)`
	`47`	`+ .completed(40),`
`48`	`48`	`]`
`49`	`49`	`)`
`50`	`50`	`.filterOne { $0 == 20 }`
`@@ -55,7 +55,7 @@ final class ObservableTypeTests: XCTestCase {`
`55`	`55`
`56`	`56`	`XCTAssertEqual(filterOneObserver.events, [`
`57`	`57`	`.next(20, 20),`
`58`		`- .completed(20)`
	`58`	`+ .completed(20),`
`59`	`59`	`])`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	// `swift test --generate-linuxmain`
`7`	`7`	`// to regenerate.`
`8`	`8`	`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),`
`10`	`10`	`]`
`11`	`11`	`}`
`12`	`12`
`@@ -16,7 +16,7 @@`
`16`	`16`	`// to regenerate.`
`17`	`17`	`static let __allTests__DictionaryExtensionsTests = [`
`18`	`18`	`("test_get_or_put", test_get_or_put),`
`19`		`- ("test_unrapping_subscript", test_unrapping_subscript)`
	`19`	`+ ("test_unrapping_subscript", test_unrapping_subscript),`
`20`	`20`	`]`
`21`	`21`	`}`
`22`	`22`
`@@ -25,7 +25,7 @@`
`25`	`25`	// `swift test --generate-linuxmain`
`26`	`26`	`// to regenerate.`
`27`	`27`	`static let __allTests__DispatchQueueTests = [`
`28`		`- ("test_main_queue", test_main_queue)`
	`28`	`+ ("test_main_queue", test_main_queue),`
`29`	`29`	`]`
`30`	`30`	`}`
`31`	`31`
`@@ -36,7 +36,7 @@`
`36`	`36`	`static let __allTests__DispatcherTests = [`
`37`	`37`	`("test_add_remove_middleware", test_add_remove_middleware),`
`38`	`38`	`("test_add_remove_service", test_add_remove_service),`
`39`		`- ("test_subscription_count", test_subscription_count)`
	`39`	`+ ("test_subscription_count", test_subscription_count),`
`40`	`40`	`]`
`41`	`41`	`}`
`42`	`42`
`@@ -47,7 +47,7 @@`
`47`	`47`	`static let __allTests__ObservableTypeTests = [`
`48`	`48`	`("test_dispatch_action_from_store", test_dispatch_action_from_store),`
`49`	`49`	`("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),`
`51`	`51`	`]`
`52`	`52`	`}`
`53`	`53`
`@@ -59,8 +59,10 @@`
`59`	`59`	`("test_completable_action_action", test_completable_action_action),`
`60`	`60`	`("test_completable_action_dispatch", test_completable_action_dispatch),`
`61`	`61`	`("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),`
`62`	`64`	`("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),`
`64`	`66`	`]`
`65`	`67`	`}`
`66`	`68`
`@@ -69,6 +71,7 @@`
`69`	`71`	// `swift test --generate-linuxmain`
`70`	`72`	`// to regenerate.`
`71`	`73`	`static let __allTests__PromiseTests = [`
	`74`	`+ ("test_equality_completed", test_equality_completed),`
`72`	`75`	`("test_equality_error", test_equality_error),`
`73`	`76`	`("test_equality_pending", test_equality_pending),`
`74`	`77`	`("test_equality_with_value", test_equality_with_value),`
`@@ -79,7 +82,7 @@`
`79`	`82`	`("test_is_rejected", test_is_rejected),`
`80`	`83`	`("test_is_resolved", test_is_resolved),`
`81`	`84`	`("test_promise_properties", test_promise_properties),`
`82`		`- ("test_reject", test_reject)`
	`85`	`+ ("test_reject", test_reject),`
`83`	`86`	`]`
`84`	`87`	`}`
`85`	`88`
`@@ -93,7 +96,7 @@`
`93`	`96`	`("test_reset_state", test_reset_state),`
`94`	`97`	`("test_state_received_in_store", test_state_received_in_store),`
`95`	`98`	`("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),`
`97`	`100`	`]`
`98`	`101`	`}`
`99`	`102`
`@@ -106,7 +109,7 @@`
`106`	`109`	`testCase(ObservableTypeTests.__allTests__ObservableTypeTests),`
`107`	`110`	`testCase(PrimitiveSequenceTypeTests.__allTests__PrimitiveSequenceTypeTests),`
`108`	`111`	`testCase(PromiseTests.__allTests__PromiseTests),`
`109`		`- testCase(ReducerTests.__allTests__ReducerTests)`
	`112`	`+ testCase(ReducerTests.__allTests__ReducerTests),`
`110`	`113`	`]`
`111`	`114`	`}`
`112`	`115`	`#endif`