Merge branch '0.6' into 0.6.0rc1-spec-changes

* 0.6: correct library path as the zip contains folder add admob podspec Clean paths should be the same for either platform. Update new pods for 0.6 Replace post_install use to append to pch by prefix_header_file and prefix_header_contents. Only check the master branch on Travis. Remove the use of `config.ios?` or `config.osx?`. Conflicts: CocoaAsyncSocket/0.0.1/CocoaAsyncSocket.podspec
peakerWd · Apr 26, 2012 · 713c85a · 713c85a
2 parents 985b618 + b36a6c3
commit 713c85a
Show file tree

Hide file tree

Showing 42 changed files with 161 additions and 323 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,7 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
+branches:
+  only:
+    - master
 install: rake travis:setup
diff --git a/AFNetworking/0.5.1/AFNetworking.podspec b/AFNetworking/0.5.1/AFNetworking.podspec
@@ -6,17 +6,16 @@ Pod::Spec.new do |s|
   s.author   = { 'Gowalla' => 'live@gowalla.com' }
   s.source   = { :git => 'https://github.com/gowalla/AFNetworking.git', :tag => '0.5.1' }
 
-  if config.ios?
-    s.source_files = 'AFNetworking' # everything
-  else
-    s.source_files = %w{
-      AFNetworking/AFHTTPRequestOperation.h
-      AFNetworking/AFJSONRequestOperation.h
-      AFNetworking/NSData+AFNetworking.h
-      AFNetworking/NSMutableURLRequest+AFNetworking.h
-      AFNetworking/NSString+AFNetworking.h
-    }
-  end
+  # Everything on iOS
+  s.ios.source_files = 'AFNetworking'
+
+  s.osx.source_files = %w{
+    AFNetworking/AFHTTPRequestOperation.h
+    AFNetworking/AFJSONRequestOperation.h
+    AFNetworking/NSData+AFNetworking.h
+    AFNetworking/NSMutableURLRequest+AFNetworking.h
+    AFNetworking/NSString+AFNetworking.h
+  }
 
   s.library = 'z'
   s.dependency 'JSONKit'

diff --git a/ASIHTTPRequest/1.8.1/ASIHTTPRequest.podspec b/ASIHTTPRequest/1.8.1/ASIHTTPRequest.podspec
@@ -20,14 +20,12 @@ Pod::Spec.new do |s|
 
   s.clean_paths = '*Sample', 'External', '*.xcodeproj', 'Build Scripts'
 
-  if config.ios?
-    s.dependency 'Reachability' #, '~> 2.0', '>= 2.0.4'
-    s.source_files = 'Classes'
-    s.frameworks   = 'MobileCoreServices', 'CFNetwork', 'CoreGraphics'
-  else
-    s.source_files = FileList['Classes/*.*'].exclude(/ASIAuthenticationDialog\.\w$/)
-    s.frameworks   = 'SystemConfiguration', 'CoreServices'
-  end
+  s.ios.dependency 'Reachability' #, '~> 2.0', '>= 2.0.4'
+  s.ios.source_files = 'Classes'
+  s.ios.frameworks   = 'MobileCoreServices', 'CFNetwork', 'CoreGraphics'
+
+  s.osx.source_files = FileList['Classes/*.*'].exclude(/ASIAuthenticationDialog\.\w$/)
+  s.osx.frameworks   = 'SystemConfiguration', 'CoreServices'
 
   s.library    = 'z.1'
 end
diff --git a/AdMob/6.0.1/AdMob.podspec b/AdMob/6.0.1/AdMob.podspec
@@ -0,0 +1,19 @@
+Pod::Spec.new do |s|
+  s.name     = 'AdMob'
+  s.version  = '6.0.1'
+  s.license  = 'Commercial'
+  s.summary  = 'The Google AdMob Ads SDK.'
+  s.homepage = 'https://developers.google.com/mobile-ads-sdk/download'
+  s.author   = 'Google'
+  s.source   = { :http => 'http://dl.google.com/googleadmobadssdk/googleadmobadssdkios.zip' }
+  s.description = %{
+    The Google AdMob Ads SDK is the next generation in Google mobile advertising featuring refined ad formats and streamlined APIs for access to Google's AdMob and DoubleClick For Publishers (upgraded DFP) [Android and iOS only] mobile advertising solutions.
+  }
+
+  s.platform        = :ios
+  s.source_files    = '**/*.h'
+  s.library         = 'GoogleAdMobAds'
+  s.frameworks      = 'AudioToolbox', 'MessageUI', 'SystemConfiguration', 'CoreGraphics'
+  s.xcconfig        =  { 'LIBRARY_SEARCH_PATHS' => "$(SRCROOT)/Pods/AdMob/GoogleAdMobAdsSdkiOS-6.0.1" }
+
+end
diff --git a/BlocksKit/0.5.0/BlocksKit.podspec b/BlocksKit/0.5.0/BlocksKit.podspec
@@ -7,17 +7,11 @@ Pod::Spec.new do |s|
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :commit => '84b12bd081c71b17e56c133002eee8f8577e9a24' }
 
   s.source_files = 'BlocksKit'
+  s.prefix_header_file = 'BlocksKit/BlocksKit-Prefix.pch'
 
   s.frameworks = 'MessageUI'
 
   s.requires_arc = true
 
   s.clean_paths = 'BlocksKit.xcodeproj/', 'GHUnitIOS.framework/', 'Tests/', '.gitignore'
-
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import <dispatch/dispatch.h>\n#import "BKGlobals.h"\n#endif})
-    end
-  end
 end
diff --git a/BlocksKit/0.9.0/BlocksKit.podspec b/BlocksKit/0.9.0/BlocksKit.podspec
@@ -7,17 +7,11 @@ Pod::Spec.new do |s|
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v0.9' }
 
   s.source_files = 'BlocksKit'
+  s.prefix_header_file = 'BlocksKit/BlocksKit-Prefix.pch'
 
   s.frameworks = 'MessageUI'
 
   s.requires_arc = true
 
   s.clean_paths = 'BlocksKit.xcodeproj/', 'GHUnitIOS.framework/', 'Tests/', '.gitignore'
-
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import <dispatch/dispatch.h>\n#import "BKGlobals.h"\n#endif})
-    end
-  end
 end
diff --git a/BlocksKit/0.9.5/BlocksKit.podspec b/BlocksKit/0.9.5/BlocksKit.podspec
@@ -7,17 +7,11 @@ Pod::Spec.new do |s|
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v0.9.5' }
 
   s.source_files = 'BlocksKit'
+  s.prefix_header_file = 'BlocksKit/BlocksKit-Prefix.pch'
 
   s.frameworks = 'MessageUI'
 
   s.requires_arc = true
 
   s.clean_paths = 'BlocksKit.xcodeproj/', 'GHUnitIOS.framework/', 'Tests/', '.gitignore'
-
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import <dispatch/dispatch.h>\n#import "BlocksKit.h"\n#endif})
-    end
-  end
 end
diff --git a/BlocksKit/1.0.0/BlocksKit.podspec b/BlocksKit/1.0.0/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.0' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.1/BlocksKit.podspec b/BlocksKit/1.0.1/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.1' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.2/BlocksKit.podspec b/BlocksKit/1.0.2/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.2' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.3/BlocksKit.podspec b/BlocksKit/1.0.3/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.3' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.4/BlocksKit.podspec b/BlocksKit/1.0.4/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.4' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.5/BlocksKit.podspec b/BlocksKit/1.0.5/BlocksKit.podspec
@@ -8,15 +8,8 @@ Pod::Spec.new do |s|
                  'Alexsander Akers' => 'a2@pandamonia.us' }
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.5' }
   s.source_files = 'BlocksKit'
+  s.prefix_header_contents = '#import "BlocksKit.h"'
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks = 'MessageUI'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+  s.ios.frameworks = 'MessageUI'
 end
diff --git a/BlocksKit/1.0.6/BlocksKit.podspec b/BlocksKit/1.0.6/BlocksKit.podspec
@@ -9,16 +9,11 @@ Pod::Spec.new do |s|
   s.source   = { :git => 'https://github.com/zwaldowski/BlocksKit.git', :tag => 'v1.0.6' }
   s.dependency 'A2DynamicDelegate'
   s.clean_paths = 'GHUnitIOS.framework/', 'Tests/', 'BlocksKit.xcodeproj/', '.gitignore'
-  if config.ios?
-    s.frameworks   = 'MessageUI'
-    s.source_files = 'BlocksKit/*.{h,m}', 'BlocksKit/UIKit/*.{h,m}', 'BlocksKit/MessageUI/*.{h,m}'
-  else
-    s.source_files = 'BlocksKit/*.{h,m}'
-  end
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import "BlocksKit.h"\n#endif})
-    end
-  end
+
+  s.prefix_header_contents = '#import "BlocksKit.h"'
+
+  s.ios.frameworks   = 'MessageUI'
+  s.ios.source_files = 'BlocksKit/*.{h,m}', 'BlocksKit/UIKit/*.{h,m}', 'BlocksKit/MessageUI/*.{h,m}'
+
+  s.osx.source_files = 'BlocksKit/*.{h,m}'
 end
diff --git a/CocoaAsyncSocket/0.0.1/CocoaAsyncSocket.podspec b/CocoaAsyncSocket/0.0.1/CocoaAsyncSocket.podspec
@@ -19,9 +19,6 @@ Pod::Spec.new do |s|
   s.clean_paths  = 'Vendor', 'GCD/Xcode', 'RunLoop/Xcode'
   s.requires_arc = true
 
-  if config.ios?
-    s.frameworks = ['CFNetwork', 'Security']
-  else
-    s.frameworks = ['CoreServices', 'Security']
-  end
+  s.ios.frameworks = 'CFNetwork', 'Security'
+  s.osx.frameworks = 'CoreServices', 'Security'
 end
diff --git a/CocoaHTTPServer/2.2.1/CocoaHTTPServer.podspec b/CocoaHTTPServer/2.2.1/CocoaHTTPServer.podspec
@@ -1,20 +1,20 @@
 Pod::Spec.new do |s|
-  s.name         = 'CocoaHTTPServer'
-  s.version      = '2.2.1'
-  s.license      = 'BSD'
-  s.summary      = 'A small, lightweight, embeddable HTTP server for Mac OS X or iOS applications'
-  s.homepage     = 'https://github.com/robbiehanson/CocoaHTTPServer'
-  s.authors      = { 'Robbie Hanson' => 'cocoahttpserver@googlegroups.com' }
-  s.source       = { :git => 'https://github.com/robbiehanson/CocoaHTTPServer.git', :tag => '2.2.1' }
-  s.source_files = '{Core,Extensions}/**/*.{h,m}'
-  s.clean_paths  = %w{Samples Vendor}
-  if config.ios?
-    s.frameworks = 'CFNetwork', 'Security'
-  else
-    s.frameworks = 'CoreServices', 'Security'
-  end
-  s.library      = 'xml2'
-  s.xcconfig     = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
+  s.name           = 'CocoaHTTPServer'
+  s.version        = '2.2.1'
+  s.license        = 'BSD'
+  s.summary        = 'A small, lightweight, embeddable HTTP server for Mac OS X or iOS applications'
+  s.homepage       = 'https://github.com/robbiehanson/CocoaHTTPServer'
+  s.authors        = { 'Robbie Hanson' => 'cocoahttpserver@googlegroups.com' }
+  s.source         = { :git => 'https://github.com/robbiehanson/CocoaHTTPServer.git', :tag => '2.2.1' }
+  s.source_files   = '{Core,Extensions}/**/*.{h,m}'
+  s.clean_paths    = %w{Samples Vendor}
+
+  s.ios.frameworks = 'CFNetwork', 'Security'
+  s.osx.frameworks = 'CoreServices', 'Security'
+
+  s.library        = 'xml2'
+  s.xcconfig       = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
+
   s.dependency "CocoaAsyncSocket", "0.0.1"
   s.dependency "CocoaLumberjack", "1.3"
 end
diff --git a/CorePlot/1.0/CorePlot.podspec b/CorePlot/1.0/CorePlot.podspec
@@ -16,12 +16,8 @@ Pod::Spec.new do |s|
 
   files = FileList['framework/TestResources/CorePlotProbes.d', 'framework/Source/*.{h,m}']
   files.exclude(/(TestCase|Tests)\.[hm]/)
-  if config.ios?
-    files.include('framework/CorePlot-CocoaTouch.h', 'framework/iPhoneOnly/*.{h,m}')
-  else
-    files.include('framework/CorePlot.h', 'framework/MacOnly/*.{h,m}')
-  end
-  s.source_files = files
+  s.ios.source_files = files.dup.include('framework/CorePlot-CocoaTouch.h', 'framework/iPhoneOnly/*.{h,m}')
+  s.osx.source_files = files.dup.include('framework/CorePlot.h', 'framework/MacOnly/*.{h,m}')
 
   s.clean_paths = 'documentation', 'examples', 'scripts', 'QCPlugin', 'framework/*.{xcodeproj,lproj}'
   s.framework   = 'QuartzCore'

diff --git a/DTCoreText/1.0.0/DTCoreText.podspec b/DTCoreText/1.0.0/DTCoreText.podspec
@@ -1,23 +1,21 @@
 Pod::Spec.new do |spec|
-  spec.name         = 'DTCoreText'
-  spec.version      = '1.0.0'
-  spec.platform     = :ios
-  spec.license      = 'BSD'
-  spec.source       = { :git => 'https://github.com/Cocoanetics/DTCoreText.git', :tag => '1.0.0' }
-  spec.source_files = 'Core/Source/*.{h,m,c}'
-  spec.clean_paths  = 'Core/Test/', 'Core/DTCoreText-Info.plist', 'Core/DTCoreText-Prefix.pch', 'DTCoreText.xcodeproj/', 'Demo/', '.gitignore'
-  spec.frameworks   = 'MediaPlayer', 'QuartzCore', 'CoreText', 'CoreGraphics', 'ImageIO'
-  spec.requires_arc = true
-  spec.homepage     = 'https://github.com/Cocoanetics/DTCoreText'
-  spec.summary      = 'Methods to allow using HTML code with CoreText.'
-  spec.author       = { 'Oliver Drobnik' => 'oliver@drobnik.com' }
-  spec.library      = 'xml2'
-  spec.xcconfig     = { 'HEADER_SEARCH_PATHS' => '"$(SDKROOT)/usr/include/libxml2"' }
+  spec.name               = 'DTCoreText'
+  spec.version            = '1.0.0'
+  spec.platform           = :ios
+  spec.license            = 'BSD'
+  spec.source             = { :git => 'https://github.com/Cocoanetics/DTCoreText.git', :tag => '1.0.0' }
+  spec.prefix_header_file = 'Core/DTCoreText-Prefix.pch'
+  spec.source_files       = 'Core/Source/*.{h,m,c}'
+  spec.clean_paths        = 'Core/Test/', 'Core/DTCoreText-Info.plist', 'DTCoreText.xcodeproj/', 'Demo/', '.gitignore'
+  spec.frameworks         = 'MediaPlayer', 'QuartzCore', 'CoreText', 'CoreGraphics', 'ImageIO'
+  spec.requires_arc       = true
+  spec.homepage           = 'https://github.com/Cocoanetics/DTCoreText'
+  spec.summary            = 'Methods to allow using HTML code with CoreText.'
+  spec.author             = { 'Oliver Drobnik' => 'oliver@drobnik.com' }
+  spec.library            = 'xml2'
+  spec.xcconfig           = { 'HEADER_SEARCH_PATHS' => '"$(SDKROOT)/usr/include/libxml2"' }
+
   def spec.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#ifdef __OBJC__\n#import <CoreText/CoreText.h>\n#endif\n#define ALLOW_IPHONE_SPECIAL_CASES 1})
-    end
     Dir.chdir(config.project_pods_root + 'DTCoreText/Core/Source/') do
       Dir.glob('*.css') do |css_file|
         system '/usr/bin/xxd', '-i', css_file, css_file + '.c'

diff --git a/FileMD5Hash/0.0.1/FileMD5Hash.podspec b/FileMD5Hash/0.0.1/FileMD5Hash.podspec
@@ -7,13 +7,7 @@ Pod::Spec.new do |s|
   s.author   = { 'Joel Lopes Da Silva' => 'joel@lopes-da-silva.com' }
   s.source   = { :git => 'https://github.com/JoeKun/FileMD5Hash.git', :commit => 'd00c0c51c6d0955d9daf94c30cfd95a219d4914e' }
 
+  s.prefix_header_file = 'Common/FileMD5Hash_Prefix.pch'
   s.source_files = 'Common/*.{h,c}'
   s.clean_paths = "Mac", "iOS", 'FileMD5Hash.xcodeproj'
-
-  def s.post_install(target)
-    prefix_header = config.project_pods_root + target.prefix_header_filename
-    prefix_header.open('a') do |file|
-      file.puts(%{#import "FileMD5Hash_Prefix.pch"})
-    end
-  end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,7 @@ language: ruby @@
     rvm:
       - 1.8.7
       - 1.9.3
+    branches:
+      only:
+        - master
     install: rake travis:setup