Skip to content

Commit 23cf589

Browse files
CodaFiCodaFi
committed
Merge pull request #164 from CodaFi/better-together
Better Together
2 parents 6952577 + 1d25dfc commit 23cf589

File tree

106 files changed

+1734
-5610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1734
-5610
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Carthage/Checkouts/Swiftx"]
2+
path = Carthage/Checkouts/Swiftx
3+
url = https://github.com/typelift/Swiftx.git

‎.travis.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
language: objective-c
22

3+
install: git submodule update -i --recursive
4+
35
script:
4-
- xctool -project swiftz.xcodeproj -scheme swiftz -sdk macosx ONLY_ACTIVE_ARCH=NO build test
5-
- xctool -project swiftz.xcodeproj -scheme swiftz_ios -sdk iphonesimulator8.1 ONLY_ACTIVE_ARCH=NO build test
6+
- xctool -project Swiftz.xcodeproj -scheme Swiftz -sdk macosx ONLY_ACTIVE_ARCH=NO clean build test
7+
- xctool -project Swiftz-iOS.xcodeproj -scheme Swiftz -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO clean build test
68

7-
- xctool -project swiftz_core/swiftz_core.xcodeproj -scheme swiftz_core -sdk macosx ONLY_ACTIVE_ARCH=NO build test

‎Cartfile‎

Whitespace-only changes.

‎Cartfile.private‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "typelift/Swiftx" ~> 0.1.0

‎Cartfile.resolved‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "typelift/Swiftx" "v0.1.0"

‎Carthage/Checkouts/Swiftx‎

Submodule Swiftx added at 8b8dc7c

‎Swiftz-iOS.xcodeproj/project.pbxproj‎

Lines changed: 810 additions & 0 deletions
Large diffs are not rendered by default.

swiftz_core/swiftz_core.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to Swiftz-iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swiftz_core/swiftz_core.xcodeproj/xcshareddata/xcschemes/swiftz_core.xcscheme renamed to Swiftz-iOS.xcodeproj/xcshareddata/xcschemes/Swiftz-iOSTests.xcscheme

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0620"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
9-
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
15-
<BuildableReference
16-
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "59BB97DB195EFAF2002C0FA1"
18-
BuildableName = "swiftz_core.framework"
19-
BlueprintName = "swiftz_core"
20-
ReferencedContainer = "container:swiftz_core.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
239
<BuildActionEntry
2410
buildForTesting = "YES"
2511
buildForRunning = "YES"
@@ -28,10 +14,10 @@
2814
buildForAnalyzing = "YES">
2915
<BuildableReference
3016
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "59BB97E6195EFAF2002C0FA1"
32-
BuildableName = "swiftz_coreTests.xctest"
33-
BlueprintName = "swiftz_coreTests"
34-
ReferencedContainer = "container:swiftz_core.xcodeproj">
17+
BlueprintIdentifier = "84A88D5B1A70C23D003D53CF"
18+
BuildableName = "Swiftz-iOSTests.xctest"
19+
BlueprintName = "Swiftz-iOSTests"
20+
ReferencedContainer = "container:Swiftz-iOS.xcodeproj">
3521
</BuildableReference>
3622
</BuildActionEntry>
3723
</BuildActionEntries>
@@ -46,20 +32,20 @@
4632
skipped = "NO">
4733
<BuildableReference
4834
BuildableIdentifier = "primary"
49-
BlueprintIdentifier = "59BB97E6195EFAF2002C0FA1"
50-
BuildableName = "swiftz_coreTests.xctest"
51-
BlueprintName = "swiftz_coreTests"
52-
ReferencedContainer = "container:swiftz_core.xcodeproj">
35+
BlueprintIdentifier = "84A88D5B1A70C23D003D53CF"
36+
BuildableName = "Swiftz-iOSTests.xctest"
37+
BlueprintName = "Swiftz-iOSTests"
38+
ReferencedContainer = "container:Swiftz-iOS.xcodeproj">
5339
</BuildableReference>
5440
</TestableReference>
5541
</Testables>
5642
<MacroExpansion>
5743
<BuildableReference
5844
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "59BB97DB195EFAF2002C0FA1"
60-
BuildableName = "swiftz_core.framework"
61-
BlueprintName = "swiftz_core"
62-
ReferencedContainer = "container:swiftz_core.xcodeproj">
45+
BlueprintIdentifier = "84A88D5B1A70C23D003D53CF"
46+
BuildableName = "Swiftz-iOSTests.xctest"
47+
BlueprintName = "Swiftz-iOSTests"
48+
ReferencedContainer = "container:Swiftz-iOS.xcodeproj">
6349
</BuildableReference>
6450
</MacroExpansion>
6551
</TestAction>
@@ -75,10 +61,10 @@
7561
<MacroExpansion>
7662
<BuildableReference
7763
BuildableIdentifier = "primary"
78-
BlueprintIdentifier = "59BB97DB195EFAF2002C0FA1"
79-
BuildableName = "swiftz_core.framework"
80-
BlueprintName = "swiftz_core"
81-
ReferencedContainer = "container:swiftz_core.xcodeproj">
64+
BlueprintIdentifier = "84A88D5B1A70C23D003D53CF"
65+
BuildableName = "Swiftz-iOSTests.xctest"
66+
BlueprintName = "Swiftz-iOSTests"
67+
ReferencedContainer = "container:Swiftz-iOS.xcodeproj">
8268
</BuildableReference>
8369
</MacroExpansion>
8470
<AdditionalOptions>
@@ -93,10 +79,10 @@
9379
<MacroExpansion>
9480
<BuildableReference
9581
BuildableIdentifier = "primary"
96-
BlueprintIdentifier = "59BB97DB195EFAF2002C0FA1"
97-
BuildableName = "swiftz_core.framework"
98-
BlueprintName = "swiftz_core"
99-
ReferencedContainer = "container:swiftz_core.xcodeproj">
82+
BlueprintIdentifier = "84A88D5B1A70C23D003D53CF"
83+
BuildableName = "Swiftz-iOSTests.xctest"
84+
BlueprintName = "Swiftz-iOSTests"
85+
ReferencedContainer = "container:Swiftz-iOS.xcodeproj">
10086
</BuildableReference>
10187
</MacroExpansion>
10288
</ProfileAction>

swiftz.xcodeproj/xcshareddata/xcschemes/swiftz_ios.xcscheme renamed to Swiftz-iOS.xcodeproj/xcshareddata/xcschemes/Swiftz.xcscheme

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0620"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "598539FF1967F99500A3158C"
18-
BuildableName = "swiftz.framework"
19-
BlueprintName = "swiftz_ios"
20-
ReferencedContainer = "container:swiftz.xcodeproj">
17+
BlueprintIdentifier = "84A88D971A70C280003D53CF"
18+
BuildableName = "Swiftz.framework"
19+
BlueprintName = "Swiftz"
20+
ReferencedContainer = "container:Swiftz-iOS.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -32,20 +32,20 @@
3232
skipped = "NO">
3333
<BuildableReference
3434
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "59853A091967F99600A3158C"
36-
BuildableName = "swiftz_iosTests.xctest"
37-
BlueprintName = "swiftz_iosTests"
38-
ReferencedContainer = "container:swiftz.xcodeproj">
35+
BlueprintIdentifier = "84A88D5B1A70C23D003D53CF"
36+
BuildableName = "Swiftz-iOSTests.xctest"
37+
BlueprintName = "Swiftz-iOSTests"
38+
ReferencedContainer = "container:Swiftz-iOS.xcodeproj">
3939
</BuildableReference>
4040
</TestableReference>
4141
</Testables>
4242
<MacroExpansion>
4343
<BuildableReference
4444
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "598539FF1967F99500A3158C"
46-
BuildableName = "swiftz.framework"
47-
BlueprintName = "swiftz_ios"
48-
ReferencedContainer = "container:swiftz.xcodeproj">
45+
BlueprintIdentifier = "84A88D971A70C280003D53CF"
46+
BuildableName = "Swiftz.framework"
47+
BlueprintName = "Swiftz"
48+
ReferencedContainer = "container:Swiftz-iOS.xcodeproj">
4949
</BuildableReference>
5050
</MacroExpansion>
5151
</TestAction>
@@ -61,10 +61,10 @@
6161
<MacroExpansion>
6262
<BuildableReference
6363
BuildableIdentifier = "primary"
64-
BlueprintIdentifier = "598539FF1967F99500A3158C"
65-
BuildableName = "swiftz.framework"
66-
BlueprintName = "swiftz_ios"
67-
ReferencedContainer = "container:swiftz.xcodeproj">
64+
BlueprintIdentifier = "84A88D971A70C280003D53CF"
65+
BuildableName = "Swiftz.framework"
66+
BlueprintName = "Swiftz"
67+
ReferencedContainer = "container:Swiftz-iOS.xcodeproj">
6868
</BuildableReference>
6969
</MacroExpansion>
7070
<AdditionalOptions>
@@ -79,10 +79,10 @@
7979
<MacroExpansion>
8080
<BuildableReference
8181
BuildableIdentifier = "primary"
82-
BlueprintIdentifier = "598539FF1967F99500A3158C"
83-
BuildableName = "swiftz.framework"
84-
BlueprintName = "swiftz_ios"
85-
ReferencedContainer = "container:swiftz.xcodeproj">
82+
BlueprintIdentifier = "84A88D971A70C280003D53CF"
83+
BuildableName = "Swiftz.framework"
84+
BlueprintName = "Swiftz"
85+
ReferencedContainer = "container:Swiftz-iOS.xcodeproj">
8686
</BuildableReference>
8787
</MacroExpansion>
8888
</ProfileAction>

0 commit comments

Comments
 (0)