Fix Operadics dependency in First.swift; properly linked FunctionTests; update package definition

Elviro Rocca · Elviro Rocca · commit 23c3684dac39 · 2018-04-17T15:02:45.000+02:00
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.1
 
 import Foundation
 import PackageDescription
diff --git a/Sources/Abstract/Free/FreeMonoid.swift b/Sources/Abstract/Free/FreeMonoid.swift
@@ -1,5 +1,5 @@
 #if SWIFT_PACKAGE
-import Operadics
+	import Operadics
 #endif
 
 // sourcery: fixedTypesForPropertyBasedTests = "Int"
diff --git a/Sources/Abstract/Types/Bool.swift b/Sources/Abstract/Types/Bool.swift
@@ -1,13 +1,3 @@
-//
-//  Bool.swift
-//  Abstract
-//
-//  Created by Elviro Rocca on 13/04/18.
-//  Copyright © 2018 TypeLift. All rights reserved.
-//
-
-import Foundation
-
 extension Bool: Semiring {
 	public typealias Additive = And
 	public typealias Multiplicative = Or
diff --git a/Sources/Abstract/Types/First.swift b/Sources/Abstract/Types/First.swift
@@ -1,4 +1,6 @@
-import Foundation
+#if SWIFT_PACKAGE
+	import Operadics
+#endif
 
 // sourcery: wrapperEquatable
 // sourcery: fixedTypesForPropertyBasedTests = "Int"
diff --git a/Sources/Abstract/Types/Function.swift b/Sources/Abstract/Types/Function.swift
@@ -1,11 +1,3 @@
-//
-//  Function.swift
-//  Abstract
-//
-//  Created by Elviro Rocca on 13/04/18.
-//  Copyright © 2018 TypeLift. All rights reserved.
-//
-
 #if SWIFT_PACKAGE
 	import Operadics
 #endif
diff --git a/Sources/Abstract/Types/Max.swift b/Sources/Abstract/Types/Max.swift
@@ -1,11 +1,3 @@
-//
-//  Max.swift
-//  Abstract
-//
-//  Created by Elviro Rocca on 13/04/18.
-//  Copyright © 2018 TypeLift. All rights reserved.
-//
-
 #if SWIFT_PACKAGE
 	import Operadics
 #endif
diff --git a/Sources/Abstract/Types/Min.swift b/Sources/Abstract/Types/Min.swift
@@ -1,11 +1,3 @@
-//
-//  Min.swift
-//  Abstract
-//
-//  Created by Elviro Rocca on 13/04/18.
-//  Copyright © 2018 TypeLift. All rights reserved.
-//
-
 #if SWIFT_PACKAGE
 	import Operadics
 #endif
diff --git a/Sources/Abstract/Types/Multiply.swift b/Sources/Abstract/Types/Multiply.swift
@@ -1,11 +1,3 @@
-//
-//  Multiply.swift
-//  Abstract
-//
-//  Created by Elviro Rocca on 13/04/18.
-//  Copyright © 2018 TypeLift. All rights reserved.
-//
-
 #if SWIFT_PACKAGE
 	import Operadics
 #endif
diff --git a/Sources/Abstract/Types/Or.swift b/Sources/Abstract/Types/Or.swift
@@ -1,11 +1,3 @@
-//
-//  Or.swift
-//  Abstract
-//
-//  Created by Elviro Rocca on 13/04/18.
-//  Copyright © 2018 TypeLift. All rights reserved.
-//
-
 #if SWIFT_PACKAGE
 	import Operadics
 #endif
diff --git a/Sources/Abstract/Types/Ordering.swift b/Sources/Abstract/Types/Ordering.swift
@@ -1,13 +1,5 @@
-//
-//  Ordering.swift
-//  Abstract
-//
-//  Created by Elviro Rocca on 13/04/18.
-//  Copyright © 2018 TypeLift. All rights reserved.
-//
-
 #if SWIFT_PACKAGE
-import Operadics
+	import Operadics
 #endif
 
 // sourcery: arbitrary
diff --git a/Tests/AbstractTests/FunctionTests.swift b/Tests/AbstractTests/FunctionTests.swift
@@ -2,8 +2,6 @@ import XCTest
 @testable import Abstract
 import SwiftCheck
 
-// Function tests
-
 final class FunctionTests: XCTestCase {
 	func testWellBehavedWrapped() {
 		property("Function is a well-behaved Wrapper") <- forAll { (a: Function<Int,Int>, context: Int) in
@@ -45,6 +43,12 @@ final class FunctionTests: XCTestCase {
 		}
 	}
 
-
-
+	static var allTests = [
+		("testWellBehavedWrapped",testWellBehavedWrapped),
+		("testSemigroup",testSemigroup),
+		("testMonoid",testMonoid),
+		("testCommutativeMonoid",testCommutativeMonoid),
+		("testBoundedSemilattice",testBoundedSemilattice),
+		("testSemiring",testSemiring),
+	]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version:4.0`
	`1`	`+// swift-tools-version:4.1`
`2`	`2`
`3`	`3`	`import Foundation`
`4`	`4`	`import PackageDescription`