Skip to content
This repository was archived by the owner on Dec 5, 2019. It is now read-only.

Commit ee85a34

Browse files
author
Coneko
committed
Merge pull request ReactiveCocoa#1413 from ReactiveCocoa/xcode6
Xcode 6 support
2 parents 2c24259 + cee188f commit ee85a34

File tree

309 files changed

+5181
-7209
lines changed

Some content is hidden

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

309 files changed

+5181
-7209
lines changed

‎.gitmodules

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
[submodule "external/specta"]
2-
path = external/specta
3-
url = https://github.com/specta/specta.git
4-
[submodule "external/expecta"]
5-
path = external/expecta
6-
url = https://github.com/specta/expecta.git
7-
[submodule "external/xcconfigs"]
8-
path = external/xcconfigs
1+
[submodule "External/xcconfigs"]
2+
path = External/xcconfigs
93
url = https://github.com/jspahrsummers/xcconfigs.git
4+
[submodule "External/Quick"]
5+
path = External/Quick
6+
url = https://github.com/github/Quick.git

‎External/Quick

Submodule Quick added at 04d1ef8

‎External/xcconfigs

Submodule xcconfigs added at 6c7a02a

‎ReactiveCocoa.xcodeproj/project.pbxproj

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

‎ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa-iOS-UIKitTestHost.xcscheme renamed to ‎ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa Mac.xcscheme

Lines changed: 26 additions & 26 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 = "0510"
3+
LastUpgradeVersion = "0610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -14,23 +14,23 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "1860F411177C91B500C7B3C9"
18-
BuildableName = "ReactiveCocoa-iOS-UIKitTestHost.app"
19-
BlueprintName = "ReactiveCocoa-iOS-UIKitTestHost"
17+
BlueprintIdentifier = "D04725E919E49ED7006002AA"
18+
BuildableName = "ReactiveCocoa.framework"
19+
BlueprintName = "ReactiveCocoa-Mac"
2020
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
<BuildActionEntry
2424
buildForTesting = "YES"
25-
buildForRunning = "YES"
25+
buildForRunning = "NO"
2626
buildForProfiling = "NO"
2727
buildForArchiving = "NO"
28-
buildForAnalyzing = "YES">
28+
buildForAnalyzing = "NO">
2929
<BuildableReference
3030
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "1860F42F177C91B500C7B3C9"
32-
BuildableName = "ReactiveCocoa-iOS-UIKitTestHostTests.octest"
33-
BlueprintName = "ReactiveCocoa-iOS-UIKitTestHostTests"
31+
BlueprintIdentifier = "D04725F419E49ED7006002AA"
32+
BuildableName = "ReactiveCocoa-MacTests.xctest"
33+
BlueprintName = "ReactiveCocoa-MacTests"
3434
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
3535
</BuildableReference>
3636
</BuildActionEntry>
@@ -40,25 +40,25 @@
4040
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4141
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4242
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Test">
43+
buildConfiguration = "Debug">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
4747
<BuildableReference
4848
BuildableIdentifier = "primary"
49-
BlueprintIdentifier = "1860F42F177C91B500C7B3C9"
50-
BuildableName = "ReactiveCocoa-iOS-UIKitTestHostTests.octest"
51-
BlueprintName = "ReactiveCocoa-iOS-UIKitTestHostTests"
49+
BlueprintIdentifier = "D04725F419E49ED7006002AA"
50+
BuildableName = "ReactiveCocoa-MacTests.xctest"
51+
BlueprintName = "ReactiveCocoa-MacTests"
5252
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
5353
</BuildableReference>
5454
</TestableReference>
5555
</Testables>
5656
<MacroExpansion>
5757
<BuildableReference
5858
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "1860F411177C91B500C7B3C9"
60-
BuildableName = "ReactiveCocoa-iOS-UIKitTestHost.app"
61-
BlueprintName = "ReactiveCocoa-iOS-UIKitTestHost"
59+
BlueprintIdentifier = "D04725E919E49ED7006002AA"
60+
BuildableName = "ReactiveCocoa.framework"
61+
BlueprintName = "ReactiveCocoa-Mac"
6262
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
@@ -72,15 +72,15 @@
7272
ignoresPersistentStateOnLaunch = "NO"
7373
debugDocumentVersioning = "YES"
7474
allowLocationSimulation = "YES">
75-
<BuildableProductRunnable>
75+
<MacroExpansion>
7676
<BuildableReference
7777
BuildableIdentifier = "primary"
78-
BlueprintIdentifier = "1860F411177C91B500C7B3C9"
79-
BuildableName = "ReactiveCocoa-iOS-UIKitTestHost.app"
80-
BlueprintName = "ReactiveCocoa-iOS-UIKitTestHost"
78+
BlueprintIdentifier = "D04725E919E49ED7006002AA"
79+
BuildableName = "ReactiveCocoa.framework"
80+
BlueprintName = "ReactiveCocoa-Mac"
8181
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
8282
</BuildableReference>
83-
</BuildableProductRunnable>
83+
</MacroExpansion>
8484
<AdditionalOptions>
8585
</AdditionalOptions>
8686
</LaunchAction>
@@ -90,15 +90,15 @@
9090
useCustomWorkingDirectory = "NO"
9191
buildConfiguration = "Profile"
9292
debugDocumentVersioning = "YES">
93-
<BuildableProductRunnable>
93+
<MacroExpansion>
9494
<BuildableReference
9595
BuildableIdentifier = "primary"
96-
BlueprintIdentifier = "1860F411177C91B500C7B3C9"
97-
BuildableName = "ReactiveCocoa-iOS-UIKitTestHost.app"
98-
BlueprintName = "ReactiveCocoa-iOS-UIKitTestHost"
96+
BlueprintIdentifier = "D04725E919E49ED7006002AA"
97+
BuildableName = "ReactiveCocoa.framework"
98+
BlueprintName = "ReactiveCocoa-Mac"
9999
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
100100
</BuildableReference>
101-
</BuildableProductRunnable>
101+
</MacroExpansion>
102102
</ProfileAction>
103103
<AnalyzeAction
104104
buildConfiguration = "Debug">

‎ReactiveCocoaFramework/ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa.xcscheme renamed to ‎ReactiveCocoa.xcodeproj/xcshareddata/xcschemes/ReactiveCocoa iOS.xcscheme

Lines changed: 33 additions & 22 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 = "0510"
3+
LastUpgradeVersion = "0610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -14,23 +14,23 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "88037F8215056328001A5B19"
17+
BlueprintIdentifier = "D047260B19E49F82006002AA"
1818
BuildableName = "ReactiveCocoa.framework"
19-
BlueprintName = "ReactiveCocoa"
19+
BlueprintName = "ReactiveCocoa-iOS"
2020
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
<BuildActionEntry
2424
buildForTesting = "YES"
25-
buildForRunning = "YES"
25+
buildForRunning = "NO"
2626
buildForProfiling = "NO"
2727
buildForArchiving = "NO"
28-
buildForAnalyzing = "YES">
28+
buildForAnalyzing = "NO">
2929
<BuildableReference
3030
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "88CDF7DB15000FCF00163A9F"
32-
BuildableName = "ReactiveCocoaTests.xctest"
33-
BlueprintName = "ReactiveCocoaTests"
31+
BlueprintIdentifier = "D047261519E49F82006002AA"
32+
BuildableName = "ReactiveCocoa-iOSTests.xctest"
33+
BlueprintName = "ReactiveCocoa-iOSTests"
3434
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
3535
</BuildableReference>
3636
</BuildActionEntry>
@@ -39,36 +39,29 @@
3939
<TestAction
4040
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4141
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "NO"
43-
buildConfiguration = "Test">
42+
shouldUseLaunchSchemeArgsEnv = "YES"
43+
buildConfiguration = "Debug">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
4747
<BuildableReference
4848
BuildableIdentifier = "primary"
49-
BlueprintIdentifier = "88CDF7DB15000FCF00163A9F"
50-
BuildableName = "ReactiveCocoaTests.xctest"
51-
BlueprintName = "ReactiveCocoaTests"
49+
BlueprintIdentifier = "D047261519E49F82006002AA"
50+
BuildableName = "ReactiveCocoa-iOSTests.xctest"
51+
BlueprintName = "ReactiveCocoa-iOSTests"
5252
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
5353
</BuildableReference>
5454
</TestableReference>
5555
</Testables>
5656
<MacroExpansion>
5757
<BuildableReference
5858
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "88037F8215056328001A5B19"
59+
BlueprintIdentifier = "D047260B19E49F82006002AA"
6060
BuildableName = "ReactiveCocoa.framework"
61-
BlueprintName = "ReactiveCocoa"
61+
BlueprintName = "ReactiveCocoa-iOS"
6262
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65-
<EnvironmentVariables>
66-
<EnvironmentVariable
67-
key = "DYLD_INSERT_LIBRARIES"
68-
value = "$(BUILT_PRODUCTS_DIR)/ReactiveCocoa.framework/ReactiveCocoa"
69-
isEnabled = "YES">
70-
</EnvironmentVariable>
71-
</EnvironmentVariables>
7265
</TestAction>
7366
<LaunchAction
7467
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -79,6 +72,15 @@
7972
ignoresPersistentStateOnLaunch = "NO"
8073
debugDocumentVersioning = "YES"
8174
allowLocationSimulation = "YES">
75+
<MacroExpansion>
76+
<BuildableReference
77+
BuildableIdentifier = "primary"
78+
BlueprintIdentifier = "D047260B19E49F82006002AA"
79+
BuildableName = "ReactiveCocoa.framework"
80+
BlueprintName = "ReactiveCocoa-iOS"
81+
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
82+
</BuildableReference>
83+
</MacroExpansion>
8284
<AdditionalOptions>
8385
</AdditionalOptions>
8486
</LaunchAction>
@@ -88,6 +90,15 @@
8890
useCustomWorkingDirectory = "NO"
8991
buildConfiguration = "Profile"
9092
debugDocumentVersioning = "YES">
93+
<MacroExpansion>
94+
<BuildableReference
95+
BuildableIdentifier = "primary"
96+
BlueprintIdentifier = "D047260B19E49F82006002AA"
97+
BuildableName = "ReactiveCocoa.framework"
98+
BlueprintName = "ReactiveCocoa-iOS"
99+
ReferencedContainer = "container:ReactiveCocoa.xcodeproj">
100+
</BuildableReference>
101+
</MacroExpansion>
91102
</ProfileAction>
92103
<AnalyzeAction
93104
buildConfiguration = "Debug">

‎ReactiveCocoaFramework/ReactiveCocoa.xcworkspace/contents.xcworkspacedata renamed to ‎ReactiveCocoa.xcworkspace/contents.xcworkspacedata

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ReactiveCocoaFramework/ReactiveCocoa/ReactiveCocoa-Info.plist renamed to ‎ReactiveCocoa/Info.plist

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,25 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>English</string>
6+
<string>en</string>
77
<key>CFBundleExecutable</key>
8-
<string>${EXECUTABLE_NAME}</string>
9-
<key>CFBundleIconFile</key>
10-
<string></string>
8+
<string>$(EXECUTABLE_NAME)</string>
119
<key>CFBundleIdentifier</key>
12-
<string>com.github.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)</string>
1311
<key>CFBundleInfoDictionaryVersion</key>
1412
<string>6.0</string>
1513
<key>CFBundleName</key>
16-
<string>${PRODUCT_NAME}</string>
14+
<string>$(PRODUCT_NAME)</string>
1715
<key>CFBundlePackageType</key>
1816
<string>FMWK</string>
1917
<key>CFBundleShortVersionString</key>
2018
<string>1.0</string>
2119
<key>CFBundleSignature</key>
2220
<string>????</string>
2321
<key>CFBundleVersion</key>
24-
<string>1</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2523
<key>NSHumanReadableCopyright</key>
26-
<string>Copyright © 2012 GitHub, Inc. All rights reserved.</string>
24+
<string>Copyright © 2014 GitHub. All rights reserved.</string>
2725
<key>NSPrincipalClass</key>
2826
<string></string>
2927
</dict>

‎ReactiveCocoaFramework/ReactiveCocoa/NSArray+RACSequenceAdditions.h renamed to ‎ReactiveCocoa/NSArray+RACSequenceAdditions.h

File renamed without changes.

‎ReactiveCocoaFramework/ReactiveCocoa/NSArray+RACSequenceAdditions.m renamed to ‎ReactiveCocoa/NSArray+RACSequenceAdditions.m

File renamed without changes.

0 commit comments

Comments
 (0)