Permalink
Browse files

Moved ReactiveCocoa submodule to the top level

  • Loading branch information...
1 parent ec86c4f commit f68456e5ea7bf74286c61195a923ff80ac248098 @jspahrsummers committed Aug 9, 2012
View
@@ -1,6 +1,6 @@
[submodule "libextobjc"]
path = libextobjc
url = git://github.com/jspahrsummers/libextobjc.git
-[submodule "Demos/PhotoUploader/ReactiveCocoa"]
- path = Demos/PhotoUploader/ReactiveCocoa
+[submodule "ReactiveCocoa"]
+ path = ReactiveCocoa
url = git://github.com/github/ReactiveCocoa.git
@@ -20,12 +20,12 @@
D053F06515B64200005CBF00 /* libObjectiveHaskell.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D053F03415B641C1005CBF00 /* libObjectiveHaskell.a */; };
D06ABCE415C66157009679C1 /* EXTScope.m in Sources */ = {isa = PBXBuildFile; fileRef = D06ABCE215C66157009679C1 /* EXTScope.m */; };
D0852F2015CF9C1A0041EEF0 /* JSONUtils.hs in Sources */ = {isa = PBXBuildFile; fileRef = D0852F1E15CF9C100041EEF0 /* JSONUtils.hs */; };
- D08A8A9115CBBA470084E989 /* ReactiveCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D08A8A8A15CBBA350084E989 /* ReactiveCocoa.framework */; };
- D08A8A9315CBBA560084E989 /* ReactiveCocoa.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = D08A8A8A15CBBA350084E989 /* ReactiveCocoa.framework */; };
D08A8AF715CBC5FB0084E989 /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = D08A8AF615CBC5FB0084E989 /* User.m */; };
D08A8B5A15CBC7700084E989 /* UserViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D08A8B5915CBC7700084E989 /* UserViewModel.m */; };
D08A8B7B15CBCBDD0084E989 /* UserWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D08A8B7915CBCBDD0084E989 /* UserWindowController.m */; };
D08A8B7C15CBCBDD0084E989 /* UserWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D08A8B7A15CBCBDD0084E989 /* UserWindowController.xib */; };
+ D0C7836A15D35035002E5678 /* ReactiveCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C7836315D3500A002E5678 /* ReactiveCocoa.framework */; };
+ D0C7836B15D3503E002E5678 /* ReactiveCocoa.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = D0C7836315D3500A002E5678 /* ReactiveCocoa.framework */; };
D0F86B3015B8CCC200D36357 /* LoginWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F86B2E15B8CCC200D36357 /* LoginWindowController.m */; };
D0F86B3115B8CCC200D36357 /* LoginWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0F86B2F15B8CCC200D36357 /* LoginWindowController.xib */; };
D0F86B3315B8CFB900D36357 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0F86B3215B8CFB900D36357 /* WebKit.framework */; };
@@ -76,28 +76,28 @@
remoteGlobalIDString = D09061EA15B0DD37001CAC43;
remoteInfo = "ObjectiveHaskell Mac";
};
- D08A8A8915CBBA350084E989 /* PBXContainerItemProxy */ = {
+ D0C7836215D3500A002E5678 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D08A8A7E15CBBA340084E989 /* ReactiveCocoa.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 88037F8315056328001A5B19;
remoteInfo = ReactiveCocoa;
};
- D08A8A8B15CBBA350084E989 /* PBXContainerItemProxy */ = {
+ D0C7836415D3500A002E5678 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D08A8A7E15CBBA340084E989 /* ReactiveCocoa.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 88F440AB153DAC820097B4C3;
remoteInfo = "ReactiveCocoa-iOS";
};
- D08A8A8D15CBBA350084E989 /* PBXContainerItemProxy */ = {
+ D0C7836615D3500A002E5678 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D08A8A7E15CBBA340084E989 /* ReactiveCocoa.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 88CDF7DC15000FCF00163A9F;
remoteInfo = ReactiveCocoaTests;
};
- D08A8A8F15CBBA440084E989 /* PBXContainerItemProxy */ = {
+ D0C7836815D3502D002E5678 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D08A8A7E15CBBA340084E989 /* ReactiveCocoa.xcodeproj */;
proxyType = 1;
@@ -113,7 +113,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
- D08A8A9315CBBA560084E989 /* ReactiveCocoa.framework in Copy Frameworks */,
+ D0C7836B15D3503E002E5678 /* ReactiveCocoa.framework in Copy Frameworks */,
);
name = "Copy Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -164,7 +164,7 @@
D06ABD2015C661C1009679C1 /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
D06ABD2115C661C1009679C1 /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
D0852F1E15CF9C100041EEF0 /* JSONUtils.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = JSONUtils.hs; sourceTree = "<group>"; };
- D08A8A7E15CBBA340084E989 /* ReactiveCocoa.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactiveCocoa.xcodeproj; path = ReactiveCocoa/ReactiveCocoaFramework/ReactiveCocoa.xcodeproj; sourceTree = "<group>"; };
+ D08A8A7E15CBBA340084E989 /* ReactiveCocoa.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactiveCocoa.xcodeproj; path = ../../ReactiveCocoa/ReactiveCocoaFramework/ReactiveCocoa.xcodeproj; sourceTree = "<group>"; };
D08A8AF515CBC5FB0084E989 /* User.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = User.h; sourceTree = "<group>"; };
D08A8AF615CBC5FB0084E989 /* User.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = User.m; sourceTree = "<group>"; };
D08A8B5815CBC7700084E989 /* UserViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserViewModel.h; sourceTree = "<group>"; };
@@ -184,7 +184,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- D08A8A9115CBBA470084E989 /* ReactiveCocoa.framework in Frameworks */,
+ D0C7836A15D35035002E5678 /* ReactiveCocoa.framework in Frameworks */,
D0F86B3315B8CFB900D36357 /* WebKit.framework in Frameworks */,
D053F06515B64200005CBF00 /* libObjectiveHaskell.a in Frameworks */,
D053EFF415B641A0005CBF00 /* Cocoa.framework in Frameworks */,
@@ -379,23 +379,23 @@
path = "../libextobjc/Configuration/Mac OS X";
sourceTree = "<group>";
};
- D08A8A7F15CBBA340084E989 /* Products */ = {
+ D08A8B5715CBC75B0084E989 /* View Models */ = {
isa = PBXGroup;
children = (
- D08A8A8A15CBBA350084E989 /* ReactiveCocoa.framework */,
- D08A8A8C15CBBA350084E989 /* libReactiveCocoa-iOS.a */,
- D08A8A8E15CBBA350084E989 /* ReactiveCocoaTests.octest */,
+ D08A8B5815CBC7700084E989 /* UserViewModel.h */,
+ D08A8B5915CBC7700084E989 /* UserViewModel.m */,
);
- name = Products;
+ name = "View Models";
sourceTree = "<group>";
};
- D08A8B5715CBC75B0084E989 /* View Models */ = {
+ D0C7835D15D3500A002E5678 /* Products */ = {
isa = PBXGroup;
children = (
- D08A8B5815CBC7700084E989 /* UserViewModel.h */,
- D08A8B5915CBC7700084E989 /* UserViewModel.m */,
+ D0C7836315D3500A002E5678 /* ReactiveCocoa.framework */,
+ D0C7836515D3500A002E5678 /* libReactiveCocoa-iOS.a */,
+ D0C7836715D3500A002E5678 /* ReactiveCocoaTests.octest */,
);
- name = "View Models";
+ name = Products;
sourceTree = "<group>";
};
D0F86B3415B8D1CC00D36357 /* Views and Controllers */ = {
@@ -440,7 +440,7 @@
D0F86B3915B8D25F00D36357 /* PBXBuildRule */,
);
dependencies = (
- D08A8A9015CBBA440084E989 /* PBXTargetDependency */,
+ D0C7836915D3502D002E5678 /* PBXTargetDependency */,
D053F06415B641FB005CBF00 /* PBXTargetDependency */,
);
name = PhotoUploader;
@@ -492,7 +492,7 @@
ProjectRef = D053F02715B641C1005CBF00 /* ObjectiveHaskell.xcodeproj */;
},
{
- ProductGroup = D08A8A7F15CBBA340084E989 /* Products */;
+ ProductGroup = D0C7835D15D3500A002E5678 /* Products */;
ProjectRef = D08A8A7E15CBBA340084E989 /* ReactiveCocoa.xcodeproj */;
},
);
@@ -519,25 +519,25 @@
remoteRef = D053F03515B641C1005CBF00 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- D08A8A8A15CBBA350084E989 /* ReactiveCocoa.framework */ = {
+ D0C7836315D3500A002E5678 /* ReactiveCocoa.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = ReactiveCocoa.framework;
- remoteRef = D08A8A8915CBBA350084E989 /* PBXContainerItemProxy */;
+ remoteRef = D0C7836215D3500A002E5678 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- D08A8A8C15CBBA350084E989 /* libReactiveCocoa-iOS.a */ = {
+ D0C7836515D3500A002E5678 /* libReactiveCocoa-iOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libReactiveCocoa-iOS.a";
- remoteRef = D08A8A8B15CBBA350084E989 /* PBXContainerItemProxy */;
+ remoteRef = D0C7836415D3500A002E5678 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- D08A8A8E15CBBA350084E989 /* ReactiveCocoaTests.octest */ = {
+ D0C7836715D3500A002E5678 /* ReactiveCocoaTests.octest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = ReactiveCocoaTests.octest;
- remoteRef = D08A8A8D15CBBA350084E989 /* PBXContainerItemProxy */;
+ remoteRef = D0C7836615D3500A002E5678 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -619,10 +619,10 @@
name = "ObjectiveHaskell Mac";
targetProxy = D053F06315B641FB005CBF00 /* PBXContainerItemProxy */;
};
- D08A8A9015CBBA440084E989 /* PBXTargetDependency */ = {
+ D0C7836915D3502D002E5678 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = ReactiveCocoa;
- targetProxy = D08A8A8F15CBBA440084E989 /* PBXContainerItemProxy */;
+ targetProxy = D0C7836815D3502D002E5678 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@@ -34,7 +34,7 @@ - (id)initWithWindow:(NSWindow *)window {
self = [super initWithWindow:window];
if (self == nil) return nil;
- _loginSubscribable = [RACSubject subject];
+ _loginSubscribable = [RACAsyncSubject subject];
return self;
}
Submodule ReactiveCocoa deleted from 60f082
Submodule ReactiveCocoa added at 41f3fe

0 comments on commit f68456e

Please sign in to comment.