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

This changes dependencies from ReactiveCocoa 2.x to ReactiveObjC 2.1.x #52

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.3
github "ReactiveCocoa/ReactiveObjC" ~> 2.1.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Nimble" "v0.2.0"
github "Quick/Quick" "v0.2.2"
github "ReactiveCocoa/ReactiveCocoa" "v2.4.3"
github "ReactiveCocoa/ReactiveObjC" "v2.1.0"
github "jspahrsummers/xcconfigs" "0.7.1"
30 changes: 30 additions & 0 deletions ReactiveViewModel.podspec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"name": "ReactiveViewModel",
"version": "0.4",
"summary": "Model-View-ViewModel, using ReactiveCocoa.",
"description": "ReactiveViewModel is a combination code/documentation project for building Cocoa applications using Model-View-ViewModel and ReactiveCocoa.\n\nBy explaining rationale, documenting best practices, and providing reusable library components, we want to make MVVM in Objective-C appealing and easy.",
"homepage": "https://github.com/ReactiveCocoa/ReactiveViewModel",
"license": {
"type": "MIT",
"file": "LICENSE.md"
},
"authors": {
"Alan Rogers": "[email protected]",
"Just Spahr-Summers": "[email protected]",
"Josh Abernathy": "[email protected]"
},
"platforms": {
"ios": "6.0",
"osx": "10.8"
},
"source": {
"git": "https://github.com/ReactiveCocoa/ReactiveViewModel.git",
"tag": "0.4"
},
"source_files": "ReactiveViewModel/*.{h,m}",
"requires_arc": true,
"dependencies": {
"ReactiveObjC": []
},
"prepare_command": "find . \\( -regex '.*EXT.*\\.[mh]$' -o -regex '.*metamacros\\.[mh]$' \\) -execdir mv {} RAC{} \\;\nfind . -regex '.*\\.[hm]' -exec sed -i '' -E 's@\"(EXT.*|metamacros)\\.h\"@\"RAC\\1.h\"@' {} \\;\nfind . -regex '.*\\.[hm]' -exec sed -i '' -E 's@<ReactiveObjC/(EXT.*)\\.h>@<ReactiveObjC/RAC\\1.h>@' {} \\;\n"
}
3 changes: 1 addition & 2 deletions ReactiveViewModel/RVMViewModel.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

#import "RVMViewModel.h"
#import <libkern/OSAtomic.h>
#import <ReactiveCocoa/EXTScope.h>
#import <ReactiveCocoa/ReactiveCocoa.h>
#import <ReactiveObjC/ReactiveObjC.h>

// The number of seconds by which signal events are throttled when using
// -throttleSignalWhileInactive:.
Expand Down
2 changes: 1 addition & 1 deletion ReactiveViewModel/ReactiveViewModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ FOUNDATION_EXPORT const unsigned char ReactiveViewModelVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <ReactiveViewModel/PublicHeader.h>

#import <ReactiveViewModel/RVMViewModel.h>
#import <ReactiveViewModel/RVMViewModel.h>
2 changes: 1 addition & 1 deletion ReactiveViewModelTests/RVMViewModelSpec.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import <Nimble/Nimble.h>
#import <Quick/Quick.h>
#import <ReactiveCocoa/ReactiveCocoa.h>
#import <ReactiveObjC/ReactiveObjC.h>
#import <ReactiveViewModel/ReactiveViewModel.h>

#import "RVMTestViewModel.h"
Expand Down