Fix naming conflict with FLUX.

techery · Aug 19, 2016 · 849170d · 849170d
1 parent a259654
commit 849170d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Oscar.podspec b/Oscar.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "Oscar"
-  s.version          = "1.0.1"
+  s.version          = "1.0.4"
   s.summary          = "Actor programming model framework"
 
   s.description      = "The actor model in computer science is a mathematical model of concurrent computation that treats \"actors\" as the universal primitives of concurrent computation: in response to a message that it receives, an actor can make local decisions, create more actors, send more messages, and determine how to respond to the next message received.(Wikipedia)"
@@ -24,9 +24,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.source_files = 'Pod/Classes/**/*'
-  s.resource_bundles = {
-    'Oscar' => ['Pod/Assets/*.png']
-  }
 
   s.public_header_files = 'Pod/Classes/**/*.h'
   s.dependency 'RXPromise', '~> 0.13'

diff --git a/Pod/Classes/ActorProvider/OSPullActorProvider.m b/Pod/Classes/ActorProvider/OSPullActorProvider.m
@@ -4,7 +4,7 @@
 //
 
 #import "OSPullActorProvider.h"
-#import "NSArray+Functional.h"
+#import "NSArray+Functional_Oscar.h"
 #import "OSActor.h"
 #import "OSActorExecutor.h"
 

diff --git a/Pod/Classes/Utils/NSArray+Functional.h → Pod/Classes/Utils/NSArray+Functional_Oscar.h b/Pod/Classes/Utils/NSArray+Functional.h → Pod/Classes/Utils/NSArray+Functional_Oscar.h
@@ -5,7 +5,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface NSArray (Functional)
+@interface NSArray (Functional_Oscar)
 
 - (NSArray *)map:(id (^)(id))mapBlock;
 - (NSArray *)filter:(BOOL (^)(id))filterBlock;

diff --git a/Pod/Classes/Utils/NSArray+Functional.m → Pod/Classes/Utils/NSArray+Functional_Oscar.m b/Pod/Classes/Utils/NSArray+Functional.m → Pod/Classes/Utils/NSArray+Functional_Oscar.m
@@ -3,10 +3,10 @@
 // Copyright (c) 2015 Techery. All rights reserved.
 //
 
-#import "NSArray+Functional.h"
+#import "NSArray+Functional_Oscar.h"
 
 
-@implementation NSArray(Functional)
+@implementation NSArray(Functional_Oscar)
 
 - (NSArray *)map:(id (^)(id))mapBlock {
     NSMutableArray *result = [[NSMutableArray alloc] init];