use cocoapods 2.1 dev

siuying · Aug 17, 2012 · 5d77c8f · 5d77c8f
1 parent 9dc8c0f
commit 5d77c8f
Show file tree

Hide file tree

Showing 92 changed files with 5,763 additions and 3,726 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,8 @@
 source :rubygems
 
 gem 'motion-cocoapods'
-gem 'bubble-wrap'
+gem 'bubble-wrap', :require => 'bubble-wrap/core'
+
+group :development do
+  gem 'pry'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -16,6 +16,7 @@ GEM
       open4 (~> 1.3.0)
       rake (~> 0.9.0)
       xcodeproj (>= 0.3.0)
+    coderay (1.0.7)
     colored (1.2)
     escape (0.0.4)
     faraday (0.8.4)
@@ -25,6 +26,7 @@ GEM
     hashie (1.2.0)
     i18n (0.6.0)
     json (1.7.4)
+    method_source (0.7.1)
     motion-cocoapods (1.1.0)
       cocoapods (>= 0.9.1)
     multi_json (1.3.6)
@@ -36,7 +38,12 @@ GEM
       hashie (~> 1.2)
       multi_json (~> 1.3)
     open4 (1.3.0)
+    pry (0.9.9.6)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
     rake (0.9.2.2)
+    slop (2.4.4)
     xcodeproj (0.3.1)
       activesupport (~> 3.2.6)
 
@@ -46,3 +53,4 @@ PLATFORMS
 DEPENDENCIES
   bubble-wrap
   motion-cocoapods
+  pry
diff --git a/Rakefile b/Rakefile
@@ -5,7 +5,6 @@ require 'rubygems'
 require 'bundler'
 Bundler.require :default
 
-
 Motion::Project::App.setup do |app|
   app.name = 'blocks'
   app.files_dependencies "app/app_delegate.rb" => ["app/commons/cocos2d_app_delegate.rb", "app/commons/touch_sprite.rb"]
@@ -14,14 +13,14 @@ Motion::Project::App.setup do |app|
     pod do |s|
       s.name = 'cocos2d'
       s.license = 'MIT'
-      s.version = '2.0.0'
+      s.version = '2.1.0.pre'
       s.summary = 'cocos2d for iPhone is a framework for building 2D games, demos, and other graphical/interactive applications for iPod Touch, iPhone, iPad and Mac. It is based on the cocos2d design but instead of using python it, uses objective-c.'
       s.homepage = 'http://www.cocos2d-iphone.org'
       s.author = {
         'Ricardo Quesada' => 'ricardoquesada@gmail.com',
         'Zynga Inc.' => 'https://zynga.com/'
       }
-      s.source = {:git => 'https://github.com/cocos2d/cocos2d-iphone.git', :tag => 'release-2.0'}
+      s.source = {:git => 'https://github.com/cocos2d/cocos2d-iphone.git', :commit => '04d1ad21487de8624243f7905d113c6715537d21'}
       s.source_files = ['cocos2d/**/*.{h,m,c}', 'external/kazmath/src/**/*.{c,h}', 'external/kazmath/include/**/*.{c,h}'] +
         FileList['external/libpng/*.{h,c}'].exclude(/pngtest/)
       s.xcconfig = {

diff --git a/vendor/Pods/BuildHeaders/cocos2d/CCDrawNode.h b/vendor/Pods/BuildHeaders/cocos2d/CCDrawNode.h
diff --git a/vendor/Pods/BuildHeaders/cocos2d/ccShader_PositionColorLengthTexture_frag.h b/vendor/Pods/BuildHeaders/cocos2d/ccShader_PositionColorLengthTexture_frag.h
diff --git a/vendor/Pods/BuildHeaders/cocos2d/ccShader_PositionColorLengthTexture_vert.h b/vendor/Pods/BuildHeaders/cocos2d/ccShader_PositionColorLengthTexture_vert.h
diff --git a/vendor/Pods/Headers/cocos2d/CCDrawNode.h b/vendor/Pods/Headers/cocos2d/CCDrawNode.h
diff --git a/vendor/Pods/Headers/cocos2d/ccShader_PositionColorLengthTexture_frag.h b/vendor/Pods/Headers/cocos2d/ccShader_PositionColorLengthTexture_frag.h
diff --git a/vendor/Pods/Headers/cocos2d/ccShader_PositionColorLengthTexture_vert.h b/vendor/Pods/Headers/cocos2d/ccShader_PositionColorLengthTexture_vert.h
diff --git a/vendor/Pods/Pods.bridgesupport b/vendor/Pods/Pods.bridgesupport
diff --git a/vendor/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/vendor/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/vendor/Pods/build-iPhoneSimulator/libPods.a b/vendor/Pods/build-iPhoneSimulator/libPods.a
diff --git a/vendor/Pods/cocos2d/cocos2d/CCActionCamera.h b/vendor/Pods/cocos2d/cocos2d/CCActionCamera.h
diff --git a/vendor/Pods/cocos2d/cocos2d/CCActionCatmullRom.h b/vendor/Pods/cocos2d/cocos2d/CCActionCatmullRom.h
diff --git a/vendor/Pods/cocos2d/cocos2d/CCActionEase.h b/vendor/Pods/cocos2d/cocos2d/CCActionEase.h
diff --git a/vendor/Pods/cocos2d/cocos2d/CCActionGrid3D.h b/vendor/Pods/cocos2d/cocos2d/CCActionGrid3D.h
diff --git a/vendor/Pods/cocos2d/cocos2d/CCActionInstant.h b/vendor/Pods/cocos2d/cocos2d/CCActionInstant.h