Skip to content

Commit 13066bc

Browse files
CodaFiCodaFi
authored
Merge pull request #319 from apparition47/spm-test-module-fix
Fix SPM tests layout
2 parents 6baf945 + f912305 commit 13066bc

25 files changed

+25
-25
lines changed

‎Carthage/Checkouts/SwiftCheck‎

Submodule SwiftCheck updated 38 files

‎Carthage/Checkouts/Swiftx‎

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let package = Package(
77
],
88
dependencies: [
99
.Package(url: "https://github.com/typelift/Operadics.git", versions: Version(0,2,2)...Version(0,2,2)),
10-
.Package(url: "https://github.com/typelift/Swiftx.git", versions: Version(0,5,0)...Version(0,5,0)),
10+
.Package(url: "https://github.com/typelift/Swiftx.git", versions: Version(0,5,1)...Version(0,5,1)),
1111
]
1212
)
1313

‎Swiftz.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -378,27 +378,27 @@
378378
/* Begin PBXFileReference section */
379379
821B76AF1BC43C1000AF97D6 /* Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; name = Operators.swift; path = Carthage/Checkouts/Operadics/Operators.swift; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
380380
821B76B41BC43DE100AF97D6 /* SwiftCheck.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SwiftCheck.xcodeproj; path = Carthage/Checkouts/SwiftCheck/SwiftCheck.xcodeproj; sourceTree = SOURCE_ROOT; };
381-
821BEED21D8F3EA5009F8D58 /* ArrayExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrayExtSpec.swift; path = Tests/ArrayExtSpec.swift; sourceTree = SOURCE_ROOT; };
382-
821BEED31D8F3EA5009F8D58 /* ArrowExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrowExtSpec.swift; path = Tests/ArrowExtSpec.swift; sourceTree = SOURCE_ROOT; };
383-
821BEED41D8F3EA5009F8D58 /* DictionaryExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DictionaryExtSpec.swift; path = Tests/DictionaryExtSpec.swift; sourceTree = SOURCE_ROOT; };
384-
821BEED51D8F3EA5009F8D58 /* EitherSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EitherSpec.swift; path = Tests/EitherSpec.swift; sourceTree = SOURCE_ROOT; };
385-
821BEED61D8F3EA5009F8D58 /* FunctionSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FunctionSpec.swift; path = Tests/FunctionSpec.swift; sourceTree = SOURCE_ROOT; };
386-
821BEED71D8F3EA5009F8D58 /* FunctorSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FunctorSpec.swift; path = Tests/FunctorSpec.swift; sourceTree = SOURCE_ROOT; };
387-
821BEED81D8F3EA5009F8D58 /* HListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HListSpec.swift; path = Tests/HListSpec.swift; sourceTree = SOURCE_ROOT; };
388-
821BEED91D8F3EA5009F8D58 /* IdentitySpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = IdentitySpec.swift; path = Tests/IdentitySpec.swift; sourceTree = SOURCE_ROOT; };
389-
821BEEDA1D8F3EA5009F8D58 /* ListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ListSpec.swift; path = Tests/ListSpec.swift; sourceTree = SOURCE_ROOT; };
390-
821BEEDB1D8F3EA5009F8D58 /* MonoidSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MonoidSpec.swift; path = Tests/MonoidSpec.swift; sourceTree = SOURCE_ROOT; };
391-
821BEEDC1D8F3EA5009F8D58 /* NonEmptyListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NonEmptyListSpec.swift; path = Tests/NonEmptyListSpec.swift; sourceTree = SOURCE_ROOT; };
392-
821BEEDD1D8F3EA5009F8D58 /* OptionalExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OptionalExtSpec.swift; path = Tests/OptionalExtSpec.swift; sourceTree = SOURCE_ROOT; };
393-
821BEEDE1D8F3EA5009F8D58 /* ProxySpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ProxySpec.swift; path = Tests/ProxySpec.swift; sourceTree = SOURCE_ROOT; };
394-
821BEEDF1D8F3EA5009F8D58 /* ReaderSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ReaderSpec.swift; path = Tests/ReaderSpec.swift; sourceTree = SOURCE_ROOT; };
395-
821BEEE01D8F3EA5009F8D58 /* StateSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StateSpec.swift; path = Tests/StateSpec.swift; sourceTree = SOURCE_ROOT; };
396-
821BEEE11D8F3EA5009F8D58 /* StreamSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StreamSpec.swift; path = Tests/StreamSpec.swift; sourceTree = SOURCE_ROOT; };
397-
821BEEE21D8F3EA5009F8D58 /* StringExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StringExtSpec.swift; path = Tests/StringExtSpec.swift; sourceTree = SOURCE_ROOT; };
398-
821BEEE31D8F3EA5009F8D58 /* ThoseSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ThoseSpec.swift; path = Tests/ThoseSpec.swift; sourceTree = SOURCE_ROOT; };
399-
821BEEE41D8F3EA5009F8D58 /* TupleExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TupleExtSpec.swift; path = Tests/TupleExtSpec.swift; sourceTree = SOURCE_ROOT; };
400-
821BEEE51D8F3EA5009F8D58 /* UnitSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UnitSpec.swift; path = Tests/UnitSpec.swift; sourceTree = SOURCE_ROOT; };
401-
821BEEE61D8F3EA5009F8D58 /* WriterSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WriterSpec.swift; path = Tests/WriterSpec.swift; sourceTree = SOURCE_ROOT; };
381+
821BEED21D8F3EA5009F8D58 /* ArrayExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrayExtSpec.swift; path = Tests/SwiftzTests/ArrayExtSpec.swift; sourceTree = SOURCE_ROOT; };
382+
821BEED31D8F3EA5009F8D58 /* ArrowExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrowExtSpec.swift; path = Tests/SwiftzTests/ArrowExtSpec.swift; sourceTree = SOURCE_ROOT; };
383+
821BEED41D8F3EA5009F8D58 /* DictionaryExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DictionaryExtSpec.swift; path = Tests/SwiftzTests/DictionaryExtSpec.swift; sourceTree = SOURCE_ROOT; };
384+
821BEED51D8F3EA5009F8D58 /* EitherSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EitherSpec.swift; path = Tests/SwiftzTests/EitherSpec.swift; sourceTree = SOURCE_ROOT; };
385+
821BEED61D8F3EA5009F8D58 /* FunctionSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FunctionSpec.swift; path = Tests/SwiftzTests/FunctionSpec.swift; sourceTree = SOURCE_ROOT; };
386+
821BEED71D8F3EA5009F8D58 /* FunctorSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FunctorSpec.swift; path = Tests/SwiftzTests/FunctorSpec.swift; sourceTree = SOURCE_ROOT; };
387+
821BEED81D8F3EA5009F8D58 /* HListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HListSpec.swift; path = Tests/SwiftzTests/HListSpec.swift; sourceTree = SOURCE_ROOT; };
388+
821BEED91D8F3EA5009F8D58 /* IdentitySpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = IdentitySpec.swift; path = Tests/SwiftzTests/IdentitySpec.swift; sourceTree = SOURCE_ROOT; };
389+
821BEEDA1D8F3EA5009F8D58 /* ListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ListSpec.swift; path = Tests/SwiftzTests/ListSpec.swift; sourceTree = SOURCE_ROOT; };
390+
821BEEDB1D8F3EA5009F8D58 /* MonoidSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MonoidSpec.swift; path = Tests/SwiftzTests/MonoidSpec.swift; sourceTree = SOURCE_ROOT; };
391+
821BEEDC1D8F3EA5009F8D58 /* NonEmptyListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NonEmptyListSpec.swift; path = Tests/SwiftzTests/NonEmptyListSpec.swift; sourceTree = SOURCE_ROOT; };
392+
821BEEDD1D8F3EA5009F8D58 /* OptionalExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OptionalExtSpec.swift; path = Tests/SwiftzTests/OptionalExtSpec.swift; sourceTree = SOURCE_ROOT; };
393+
821BEEDE1D8F3EA5009F8D58 /* ProxySpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ProxySpec.swift; path = Tests/SwiftzTests/ProxySpec.swift; sourceTree = SOURCE_ROOT; };
394+
821BEEDF1D8F3EA5009F8D58 /* ReaderSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ReaderSpec.swift; path = Tests/SwiftzTests/ReaderSpec.swift; sourceTree = SOURCE_ROOT; };
395+
821BEEE01D8F3EA5009F8D58 /* StateSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StateSpec.swift; path = Tests/SwiftzTests/StateSpec.swift; sourceTree = SOURCE_ROOT; };
396+
821BEEE11D8F3EA5009F8D58 /* StreamSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StreamSpec.swift; path = Tests/SwiftzTests/StreamSpec.swift; sourceTree = SOURCE_ROOT; };
397+
821BEEE21D8F3EA5009F8D58 /* StringExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StringExtSpec.swift; path = Tests/SwiftzTests/StringExtSpec.swift; sourceTree = SOURCE_ROOT; };
398+
821BEEE31D8F3EA5009F8D58 /* ThoseSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ThoseSpec.swift; path = Tests/SwiftzTests/ThoseSpec.swift; sourceTree = SOURCE_ROOT; };
399+
821BEEE41D8F3EA5009F8D58 /* TupleExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TupleExtSpec.swift; path = Tests/SwiftzTests/TupleExtSpec.swift; sourceTree = SOURCE_ROOT; };
400+
821BEEE51D8F3EA5009F8D58 /* UnitSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UnitSpec.swift; path = Tests/SwiftzTests/UnitSpec.swift; sourceTree = SOURCE_ROOT; };
401+
821BEEE61D8F3EA5009F8D58 /* WriterSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WriterSpec.swift; path = Tests/SwiftzTests/WriterSpec.swift; sourceTree = SOURCE_ROOT; };
402402
821BEF261D8F3EB0009F8D58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Tests/Info.plist; sourceTree = SOURCE_ROOT; };
403403
821BEF281D8F3EF8009F8D58 /* Applicative.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Applicative.swift; path = Sources/Applicative.swift; sourceTree = SOURCE_ROOT; };
404404
821BEF291D8F3EF8009F8D58 /* ArrayExt.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrayExt.swift; path = Sources/ArrayExt.swift; sourceTree = SOURCE_ROOT; };

Tests/ArrayExtSpec.swift renamed to Tests/SwiftzTests/ArrayExtSpec.swift

File renamed without changes.

Tests/ArrowExtSpec.swift renamed to Tests/SwiftzTests/ArrowExtSpec.swift

File renamed without changes.

Tests/DictionaryExtSpec.swift renamed to Tests/SwiftzTests/DictionaryExtSpec.swift

File renamed without changes.

Tests/EitherSpec.swift renamed to Tests/SwiftzTests/EitherSpec.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ struct EitherOf<A : Arbitrary, B : Arbitrary> : Arbitrary {
2222
}
2323

2424
static var arbitrary : Gen<EitherOf<A, B>> {
25-
return Gen.oneOf([
25+
return Gen.one(of: [
2626
A.arbitrary.map(Either.Left),
2727
B.arbitrary.map(Either.Right),
2828
]).map(EitherOf.init)

Tests/FunctionSpec.swift renamed to Tests/SwiftzTests/FunctionSpec.swift

File renamed without changes.

Tests/FunctorSpec.swift renamed to Tests/SwiftzTests/FunctorSpec.swift

File renamed without changes.

0 commit comments

Comments
 (0)