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

Commit ce3ad8e

Browse files
joshverajoshvera
committed
Merge pull request #28 from ReactiveCocoa/xcode6
Xcode 6.1 support
2 parents 073fa6f + 1adc7e2 commit ce3ad8e

File tree

18 files changed

+445
-386
lines changed

18 files changed

+445
-386
lines changed

‎External/ReactiveCocoa

Submodule ReactiveCocoa updated 318 files

‎ReactiveViewModel.xcodeproj/project.pbxproj

Lines changed: 254 additions & 286 deletions
Large diffs are not rendered by default.

‎ReactiveViewModel.xcodeproj/xcshareddata/xcschemes/ReactiveViewModel Mac.xcscheme

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "0510"
4-
version = "1.3">
4+
version = "2.0">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -22,10 +22,10 @@
2222
</BuildActionEntry>
2323
<BuildActionEntry
2424
buildForTesting = "YES"
25-
buildForRunning = "YES"
26-
buildForProfiling = "YES"
25+
buildForRunning = "NO"
26+
buildForProfiling = "NO"
2727
buildForArchiving = "NO"
28-
buildForAnalyzing = "YES">
28+
buildForAnalyzing = "NO">
2929
<BuildableReference
3030
BuildableIdentifier = "primary"
3131
BlueprintIdentifier = "D0948A52178159AD00BA8F23"
@@ -40,7 +40,7 @@
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">
@@ -53,16 +53,35 @@
5353
</BuildableReference>
5454
</TestableReference>
5555
</Testables>
56+
<MacroExpansion>
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "D0948A3A178159AD00BA8F23"
60+
BuildableName = "ReactiveViewModel.framework"
61+
BlueprintName = "ReactiveViewModel Mac"
62+
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
63+
</BuildableReference>
64+
</MacroExpansion>
5665
</TestAction>
5766
<LaunchAction
58-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
59-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
67+
selectedDebuggerIdentifier = ""
68+
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
6069
launchStyle = "0"
6170
useCustomWorkingDirectory = "NO"
6271
buildConfiguration = "Debug"
6372
ignoresPersistentStateOnLaunch = "NO"
6473
debugDocumentVersioning = "YES"
74+
debugXPCServices = "NO"
6575
allowLocationSimulation = "YES">
76+
<MacroExpansion>
77+
<BuildableReference
78+
BuildableIdentifier = "primary"
79+
BlueprintIdentifier = "D0948A3A178159AD00BA8F23"
80+
BuildableName = "ReactiveViewModel.framework"
81+
BlueprintName = "ReactiveViewModel Mac"
82+
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
83+
</BuildableReference>
84+
</MacroExpansion>
6685
<AdditionalOptions>
6786
</AdditionalOptions>
6887
</LaunchAction>
@@ -72,6 +91,15 @@
7291
useCustomWorkingDirectory = "NO"
7392
buildConfiguration = "Profile"
7493
debugDocumentVersioning = "YES">
94+
<MacroExpansion>
95+
<BuildableReference
96+
BuildableIdentifier = "primary"
97+
BlueprintIdentifier = "D0948A3A178159AD00BA8F23"
98+
BuildableName = "ReactiveViewModel.framework"
99+
BlueprintName = "ReactiveViewModel Mac"
100+
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
101+
</BuildableReference>
102+
</MacroExpansion>
75103
</ProfileAction>
76104
<AnalyzeAction
77105
buildConfiguration = "Debug">

‎ReactiveViewModel.xcodeproj/xcshareddata/xcschemes/ReactiveViewModel iOS.xcscheme

Lines changed: 34 additions & 7 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,21 +14,21 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "D0948A8C178159F900BA8F23"
18-
BuildableName = "libReactiveViewModel.a"
17+
BlueprintIdentifier = "D0C7C3A619FEFB520069B5C0"
18+
BuildableName = "ReactiveViewModel.framework"
1919
BlueprintName = "ReactiveViewModel iOS"
2020
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
<BuildActionEntry
2424
buildForTesting = "YES"
2525
buildForRunning = "YES"
26-
buildForProfiling = "YES"
26+
buildForProfiling = "NO"
2727
buildForArchiving = "NO"
2828
buildForAnalyzing = "YES">
2929
<BuildableReference
3030
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "D0948A9B178159F900BA8F23"
31+
BlueprintIdentifier = "D0C7C3B019FEFB520069B5C0"
3232
BuildableName = "ReactiveViewModel iOS Tests.xctest"
3333
BlueprintName = "ReactiveViewModel iOS Tests"
3434
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
@@ -40,19 +40,28 @@
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 = "D0948A9B178159F900BA8F23"
49+
BlueprintIdentifier = "D0C7C3B019FEFB520069B5C0"
5050
BuildableName = "ReactiveViewModel iOS Tests.xctest"
5151
BlueprintName = "ReactiveViewModel iOS Tests"
5252
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
5353
</BuildableReference>
5454
</TestableReference>
5555
</Testables>
56+
<MacroExpansion>
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "D0C7C3A619FEFB520069B5C0"
60+
BuildableName = "ReactiveViewModel.framework"
61+
BlueprintName = "ReactiveViewModel iOS"
62+
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
63+
</BuildableReference>
64+
</MacroExpansion>
5665
</TestAction>
5766
<LaunchAction
5867
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -63,6 +72,15 @@
6372
ignoresPersistentStateOnLaunch = "NO"
6473
debugDocumentVersioning = "YES"
6574
allowLocationSimulation = "YES">
75+
<MacroExpansion>
76+
<BuildableReference
77+
BuildableIdentifier = "primary"
78+
BlueprintIdentifier = "D0C7C3A619FEFB520069B5C0"
79+
BuildableName = "ReactiveViewModel.framework"
80+
BlueprintName = "ReactiveViewModel iOS"
81+
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
82+
</BuildableReference>
83+
</MacroExpansion>
6684
<AdditionalOptions>
6785
</AdditionalOptions>
6886
</LaunchAction>
@@ -72,6 +90,15 @@
7290
useCustomWorkingDirectory = "NO"
7391
buildConfiguration = "Profile"
7492
debugDocumentVersioning = "YES">
93+
<MacroExpansion>
94+
<BuildableReference
95+
BuildableIdentifier = "primary"
96+
BlueprintIdentifier = "D0C7C3A619FEFB520069B5C0"
97+
BuildableName = "ReactiveViewModel.framework"
98+
BlueprintName = "ReactiveViewModel iOS"
99+
ReferencedContainer = "container:ReactiveViewModel.xcodeproj">
100+
</BuildableReference>
101+
</MacroExpansion>
75102
</ProfileAction>
76103
<AnalyzeAction
77104
buildConfiguration = "Debug">

‎ReactiveViewModel.xcworkspace/contents.xcworkspacedata

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

‎ReactiveViewModel/ReactiveViewModel-Info.plist renamed to ‎ReactiveViewModel/Info.plist

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,23 @@
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>
25-
<key>NSHumanReadableCopyright</key>
26-
<string>Copyright © 2013 GitHub. All rights reserved.</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2723
<key>NSPrincipalClass</key>
2824
<string></string>
2925
</dict>

‎ReactiveViewModel/ReactiveViewModel-Prefix.pch

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎ReactiveViewModel/ReactiveViewModel.h

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,18 @@
22
// ReactiveViewModel.h
33
// ReactiveViewModel
44
//
5-
// Created by Justin Spahr-Summers on 2013-06-30.
6-
// Copyright (c) 2013 GitHub. All rights reserved.
5+
// Created by Justin Spahr-Summers on 2014-10-27.
6+
// Copyright (c) 2014 GitHub. All rights reserved.
77
//
88

9-
#import "RVMViewModel.h"
9+
#import <Foundation/Foundation.h>
10+
11+
//! Project version number for ReactiveViewModel.
12+
FOUNDATION_EXPORT double ReactiveViewModelVersionNumber;
13+
14+
//! Project version string for ReactiveViewModel.
15+
FOUNDATION_EXPORT const unsigned char ReactiveViewModelVersionString[];
16+
17+
// In this header, you should import all the public headers of your framework using statements like #import <ReactiveViewModel/PublicHeader.h>
18+
19+
#import <ReactiveViewModel/RVMViewModel.h>

‎ReactiveViewModel/en.lproj/InfoPlist.strings

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎ReactiveViewModelTests/ReactiveViewModelTests-Info.plist renamed to ‎ReactiveViewModelTests/Info.plist

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
<key>CFBundleDevelopmentRegion</key>
66
<string>en</string>
77
<key>CFBundleExecutable</key>
8-
<string>${EXECUTABLE_NAME}</string>
8+
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.github.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
1315
<key>CFBundlePackageType</key>
1416
<string>BNDL</string>
1517
<key>CFBundleShortVersionString</key>

0 commit comments

Comments
 (0)