Merge pull request #112 from adjust/nicolas-brugneaux-sociomantic-soc-encode-parameters

Nicolas brugneaux sociomantic soc encode parameters

Author: nonelse

Adjust.podspec

@@ -9,18 +9,20 @@ Pod::Spec.new do |s|
   s.platform       = :ios, '4.3'
   s.framework      = 'SystemConfiguration'
   s.weak_framework = 'AdSupport', 'iAd'
-  s.source_files   = 'Adjust/*.{h,m}', 'Adjust/ADJAdditions/*.{h,m}'
   s.requires_arc   = true
-  s.default_subspec = 'Standard'
+  s.default_subspec = 'Core'
 
-  s.subspec 'Standard' do |standard|
+  s.subspec 'Core' do |co|
+    co.source_files   = 'Adjust/*.{h,m}', 'Adjust/ADJAdditions/*.{h,m}'
   end
 
   s.subspec 'Sociomantic' do |sm|
     sm.source_files = 'plugin/Sociomantic/*.{h,m}'
+    sm.dependency 'Adjust/Core'
   end
 
   s.subspec 'Criteo' do |cr|
     cr.source_files = 'plugin/Criteo/*.{h,m}'
+    cr.dependency 'Adjust/Core'
   end
 end

plugin/Sociomantic/ADJSociomantic.m

@@ -372,7 +372,7 @@ + (NSArray*)filterCategories:(NSArray*)categories
         if (![category isKindOfClass:[NSString class]]) {
             id<ADJLogger> logger = [ADJAdjustFactory logger];
             [logger error:@"Categories should only contains a string, failed on: [%@] type:[%@]", category, [category class]];
-            return nil;
+            return NO;
         }
 
         return [category isKindOfClass:[NSString class]];