From faa3ce9b63706363baae9283c5263a169583329d Mon Sep 17 00:00:00 2001 From: Anisimov Vasiliy Date: Mon, 5 Dec 2016 17:59:07 +0300 Subject: [PATCH 1/3] Switch to ReactiveObjC --- Cartfile | 2 +- Cartfile.resolved | 2 +- ReactiveViewModel/RVMViewModel.m | 3 +-- ReactiveViewModel/ReactiveViewModel.h | 2 +- ReactiveViewModelTests/RVMViewModelSpec.m | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Cartfile b/Cartfile index 8dfebe2..087aeec 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.3 +github "ReactiveCocoa/ReactiveObjC" ~> 2.1.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 9b885ba..8092535 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -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" diff --git a/ReactiveViewModel/RVMViewModel.m b/ReactiveViewModel/RVMViewModel.m index 2743d19..79a3894 100644 --- a/ReactiveViewModel/RVMViewModel.m +++ b/ReactiveViewModel/RVMViewModel.m @@ -8,8 +8,7 @@ #import "RVMViewModel.h" #import -#import -#import +#import // The number of seconds by which signal events are throttled when using // -throttleSignalWhileInactive:. diff --git a/ReactiveViewModel/ReactiveViewModel.h b/ReactiveViewModel/ReactiveViewModel.h index d442776..51858f8 100644 --- a/ReactiveViewModel/ReactiveViewModel.h +++ b/ReactiveViewModel/ReactiveViewModel.h @@ -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 -#import \ No newline at end of file +#import diff --git a/ReactiveViewModelTests/RVMViewModelSpec.m b/ReactiveViewModelTests/RVMViewModelSpec.m index 23a8863..8fda81c 100644 --- a/ReactiveViewModelTests/RVMViewModelSpec.m +++ b/ReactiveViewModelTests/RVMViewModelSpec.m @@ -8,7 +8,7 @@ #import #import -#import +#import #import #import "RVMTestViewModel.h" From 95e5789b88567bef7d8186c5f8274585648472d0 Mon Sep 17 00:00:00 2001 From: Anisimov Vasiliy Date: Mon, 5 Dec 2016 18:00:12 +0300 Subject: [PATCH 2/3] .podspec --- ReactiveViewModel.podspec.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 ReactiveViewModel.podspec.json diff --git a/ReactiveViewModel.podspec.json b/ReactiveViewModel.podspec.json new file mode 100644 index 0000000..0535608 --- /dev/null +++ b/ReactiveViewModel.podspec.json @@ -0,0 +1,32 @@ +{ + "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": "alan@github.com", + "Just Spahr-Summers": "Justin.SpahrSummers@gmail.com", + "Josh Abernathy": "joshaber@gmail.com" + }, + "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": [ + "~> 2.1" + ] + }, + "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@@@' {} \\;\n" +} From c04d252fb16f6d734ee3cd980c49b134f424e865 Mon Sep 17 00:00:00 2001 From: Anisimov Vasiliy Date: Sat, 2 Jun 2018 15:32:39 +0300 Subject: [PATCH 3/3] removed version of ReactiveObjC --- ReactiveViewModel.podspec.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ReactiveViewModel.podspec.json b/ReactiveViewModel.podspec.json index 0535608..cb5367c 100644 --- a/ReactiveViewModel.podspec.json +++ b/ReactiveViewModel.podspec.json @@ -24,9 +24,7 @@ "source_files": "ReactiveViewModel/*.{h,m}", "requires_arc": true, "dependencies": { - "ReactiveObjC": [ - "~> 2.1" - ] + "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@@@' {} \\;\n" }