Skip to content
This repository was archived by the owner on May 26, 2020. It is now read-only.

Commit ce27b3a

Browse files
authored
Swift PM support. (#9)
1 parent c07455c commit ce27b3a

File tree

7 files changed

+33
-8
lines changed

7 files changed

+33
-8
lines changed

.Package.test.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import PackageDescription
2+
3+
let package = Package(
4+
name: "ReactiveCollections",
5+
dependencies: [
6+
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 0, 0, prereleaseIdentifiers: ["rc", "2"])..<Version(1, .max, .max)),
7+
.Package(url: "https://github.com/Quick/Quick", majorVersion: 1),
8+
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 5, minor: 1),
9+
]
10+
)

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,6 @@ Temporary Items
157157
# Carthage - A simple, decentralized dependency manager for Cocoa
158158
Carthage/Checkouts/
159159
Carthage/Build/
160+
161+
### Swift PM ###
162+
Packages/

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

Package.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import PackageDescription
2+
3+
let package = Package(
4+
name: "ReactiveCollections",
5+
dependencies: [
6+
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 0, 0, prereleaseIdentifiers: ["rc", "2"])..<Version(1, .max, .max)),
7+
]
8+
)

ReactiveCollections.xcodeproj/project.pbxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
7D69AAE71DF9CEE500FCB568 /* ReactiveCollections.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D69AADD1DF9CEE500FCB568 /* ReactiveCollections.framework */; };
1414
7D69AAEE1DF9CEE500FCB568 /* ReactiveCollections.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D69AAE01DF9CEE500FCB568 /* ReactiveCollections.h */; settings = {ATTRIBUTES = (Public, ); }; };
1515
7D69AAF81DF9D07800FCB568 /* ReactiveArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D69AAF71DF9D07800FCB568 /* ReactiveArray.swift */; };
16-
7D69AAFA1DF9D08C00FCB568 /* ReactiveArrayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D69AAF91DF9D08C00FCB568 /* ReactiveArrayTests.swift */; };
1716
7D69AAFE1DF9D0E200FCB568 /* ReactiveSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D69AAFC1DF9D0E200FCB568 /* ReactiveSwift.framework */; };
1817
7D69AAFF1DF9D0E200FCB568 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D69AAFD1DF9D0E200FCB568 /* Result.framework */; };
1918
7D69AB001DF9D11900FCB568 /* ReactiveSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D69AAFC1DF9D0E200FCB568 /* ReactiveSwift.framework */; };
@@ -27,7 +26,6 @@
2726
7DE06DAB1DFADB0F003303AB /* ReactiveArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D69AAF71DF9D07800FCB568 /* ReactiveArray.swift */; };
2827
7DE06DAC1DFADB19003303AB /* ReactiveSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DE06D7C1DFAD8E9003303AB /* ReactiveSwift.framework */; };
2928
7DE06DAD1DFADB19003303AB /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DE06D7D1DFAD8E9003303AB /* Result.framework */; };
30-
7DE06DAE1DFADB6D003303AB /* ReactiveArrayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D69AAF91DF9D08C00FCB568 /* ReactiveArrayTests.swift */; };
3129
7DE06DB11DFADB9F003303AB /* ReactiveSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DE06D7C1DFAD8E9003303AB /* ReactiveSwift.framework */; };
3230
7DE06DB21DFADB9F003303AB /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DE06D7D1DFAD8E9003303AB /* Result.framework */; };
3331
7DE06DB51DFADBC3003303AB /* ReactiveCollections.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7DE06D931DFADA84003303AB /* ReactiveCollections.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -38,7 +36,6 @@
3836
7DE06DD71DFADCE4003303AB /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DE06DD51DFADCE4003303AB /* Result.framework */; };
3937
7DE06DD91DFADD07003303AB /* ReactiveCollections.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D69AAE01DF9CEE500FCB568 /* ReactiveCollections.h */; settings = {ATTRIBUTES = (Public, ); }; };
4038
7DE06DDA1DFADD69003303AB /* ReactiveArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D69AAF71DF9D07800FCB568 /* ReactiveArray.swift */; };
41-
7DE06DDB1DFADD6F003303AB /* ReactiveArrayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D69AAF91DF9D08C00FCB568 /* ReactiveArrayTests.swift */; };
4239
7DE06DDC1DFADD8B003303AB /* ReactiveSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DE06DD41DFADCE4003303AB /* ReactiveSwift.framework */; };
4340
7DE06DDD1DFADD8B003303AB /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DE06DD51DFADCE4003303AB /* Result.framework */; };
4441
7DE06DDF1DFADD9B003303AB /* ReactiveCollections.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7DE06DBD1DFADCAE003303AB /* ReactiveCollections.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -48,6 +45,7 @@
4845
7DF60EEE1E007DEF0096283B /* Delta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DF60EEC1E007DEF0096283B /* Delta.swift */; };
4946
7DF60EEF1E007DEF0096283B /* Delta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DF60EEC1E007DEF0096283B /* Delta.swift */; };
5047
7DF60EF01E007DEF0096283B /* Delta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DF60EEC1E007DEF0096283B /* Delta.swift */; };
48+
9A37DC661E0B34D70075EC2E /* ReactiveArrayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A37DC651E0B34D70075EC2E /* ReactiveArrayTests.swift */; };
5149
/* End PBXBuildFile section */
5250

5351
/* Begin PBXContainerItemProxy section */
@@ -120,7 +118,6 @@
120118
7D69AAE61DF9CEE500FCB568 /* ReactiveCollectionsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ReactiveCollectionsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
121119
7D69AAED1DF9CEE500FCB568 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
122120
7D69AAF71DF9D07800FCB568 /* ReactiveArray.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReactiveArray.swift; sourceTree = "<group>"; };
123-
7D69AAF91DF9D08C00FCB568 /* ReactiveArrayTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReactiveArrayTests.swift; sourceTree = "<group>"; };
124121
7D69AAFC1DF9D0E200FCB568 /* ReactiveSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReactiveSwift.framework; path = Carthage/Build/iOS/ReactiveSwift.framework; sourceTree = "<group>"; };
125122
7D69AAFD1DF9D0E200FCB568 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Result.framework; path = Carthage/Build/iOS/Result.framework; sourceTree = "<group>"; };
126123
7DC1E2D11DFADEA400A61745 /* ReactiveCollections.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReactiveCollections.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -135,6 +132,7 @@
135132
7DE06DD41DFADCE4003303AB /* ReactiveSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReactiveSwift.framework; path = Carthage/Build/tvOS/ReactiveSwift.framework; sourceTree = "<group>"; };
136133
7DE06DD51DFADCE4003303AB /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Result.framework; path = Carthage/Build/tvOS/Result.framework; sourceTree = "<group>"; };
137134
7DF60EEC1E007DEF0096283B /* Delta.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Delta.swift; sourceTree = "<group>"; };
135+
9A37DC651E0B34D70075EC2E /* ReactiveArrayTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ReactiveArrayTests.swift; path = ReactiveCollectionsTests/ReactiveArrayTests.swift; sourceTree = "<group>"; };
138136
/* End PBXFileReference section */
139137

140138
/* Begin PBXFrameworksBuildPhase section */
@@ -262,7 +260,7 @@
262260
7D69AAEA1DF9CEE500FCB568 /* ReactiveCollectionsTests */ = {
263261
isa = PBXGroup;
264262
children = (
265-
7D69AAF91DF9D08C00FCB568 /* ReactiveArrayTests.swift */,
263+
9A37DC651E0B34D70075EC2E /* ReactiveArrayTests.swift */,
266264
7D3D8BE51DF9EB1D00E90921 /* Supporting Files */,
267265
);
268266
name = ReactiveCollectionsTests;
@@ -605,6 +603,7 @@
605603
isa = PBXSourcesBuildPhase;
606604
buildActionMask = 2147483647;
607605
files = (
606+
9A37DC661E0B34D70075EC2E /* ReactiveArrayTests.swift in Sources */,
608607
7D69AAF81DF9D07800FCB568 /* ReactiveArray.swift in Sources */,
609608
7DF60EED1E007DEF0096283B /* Delta.swift in Sources */,
610609
);
@@ -614,7 +613,6 @@
614613
isa = PBXSourcesBuildPhase;
615614
buildActionMask = 2147483647;
616615
files = (
617-
7D69AAFA1DF9D08C00FCB568 /* ReactiveArrayTests.swift in Sources */,
618616
);
619617
runOnlyForDeploymentPostprocessing = 0;
620618
};
@@ -640,7 +638,6 @@
640638
isa = PBXSourcesBuildPhase;
641639
buildActionMask = 2147483647;
642640
files = (
643-
7DE06DAE1DFADB6D003303AB /* ReactiveArrayTests.swift in Sources */,
644641
);
645642
runOnlyForDeploymentPostprocessing = 0;
646643
};
@@ -657,7 +654,6 @@
657654
isa = PBXSourcesBuildPhase;
658655
buildActionMask = 2147483647;
659656
files = (
660-
7DE06DDB1DFADD6F003303AB /* ReactiveArrayTests.swift in Sources */,
661657
);
662658
runOnlyForDeploymentPostprocessing = 0;
663659
};

Tests/LinuxMain.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import XCTest
2+
import Quick
3+
4+
@testable import ReactiveSwiftTests
5+
6+
XCTMain([ReactiveCollectionsTests.allTests()])
7+
// Quick.QCKMain([])

Tests/ReactiveArrayTests.swift renamed to Tests/ReactiveCollectionsTests/ReactiveArrayTests.swift

File renamed without changes.

0 commit comments

Comments
 (0)