motion-cocoapods 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef187da4dff56e88c14542a23a6970acd36a7d2c
-  data.tar.gz: 18f39aadb0cb87d277370ee3ea15a9f5f922252a
+  metadata.gz: 5809a607aad317dffc74f3d3dea5f6e234ae544f
+  data.tar.gz: 29f69e491f27646fd980b37b3e3fc7a349836733
 SHA512:
-  metadata.gz: b90490505d1693ae1e49994f1d0b179451a7181b6e78889cd740e506bfd4f7afb0d6ca610d0dbb555137eab8e85a74ebe5242a5cefc87fda1b566d5bf2ab2e10
-  data.tar.gz: cf9c42b17299bae6b8176de40f0a1853b97698ea500f7a98255dcbd0ccc69428736b7a576872ec37c8a8999b40b9bc1f0b0e7fea4c20422756288d96f65b4e13
+  metadata.gz: eac171e6e18c1843f055209c679fe4ea225bd2d0ddfc6a67f139ffc9202e1a528c7c0ab3dea7384871eef971c4e2b02af9a94bbc9ff0fac14328ceae23eec7df
+  data.tar.gz: 13fcec8d997ea2ee5aaa488aeee68e90e798c0f053d1470d7e333f8a5f79a45d0b730235afe654f440fb1c98e0a28a41d74055dffe8e2c290a25f13c3fb01c8e

data/lib/motion/project/cocoapods.rb

@@ -93,7 +93,9 @@ module Motion::Project
       # TODO replace this all once Xcodeproj has the proper xcconfig parser.
       if (xcconfig = self.pods_xcconfig_hash) && ldflags = xcconfig['OTHER_LDFLAGS']
         lib_search_paths = xcconfig['LIBRARY_SEARCH_PATHS'] || ""
-        lib_search_paths.gsub!('$(PODS_ROOT)', "-L#{@config.project_dir}/#{PODS_ROOT}")
+        lib_search_paths = lib_search_paths.split(/"\s/).map do |path|
+          '-L ' << path.gsub('$(PODS_ROOT)', File.join(@config.project_dir, PODS_ROOT))
+        end.join(' ')
 
         @config.libs.concat(ldflags.scan(/-l([^\s]+)/).map { |m|
           if lib_search_paths.length == 0 || File.exist?("/usr/lib/lib#{m[0]}.dylib")
@@ -111,13 +113,14 @@ module Motion::Project
             framework_search_paths << path if path
           end
         end
-        @config.framework_search_paths.concat(framework_search_paths)
-
         frameworks = ldflags.scan(/-framework\s+([^\s]+)/).map { |m| m[0] }
-        @config.frameworks.concat(frameworks)
-        @config.frameworks.uniq!
 
-        if @config.deploy_platform == 'MacOSX'
+        case @config.deploy_platform
+        when 'MacOSX'
+          @config.framework_search_paths.concat(framework_search_paths)
+          @config.frameworks.concat(frameworks)
+          @config.frameworks.uniq!
+
           framework_search_paths.each do |framework_search_path|
             frameworks.each do |framework|
               path = File.join(framework_search_path, "#{framework}.framework")
@@ -126,6 +129,20 @@ module Motion::Project
               end
             end
           end
+        when 'iPhoneOS'
+          # If we would really specify these as ‘frameworks’ then the linker
+          # would not link the archive into the application, because it does not
+          # see any references to any of the symbols in the archive. Treating it
+          # as a static library (which it is) with `-force_load` fixes this.
+          #
+          framework_search_paths.each do |framework_search_path|
+            frameworks.each do |framework|
+              path = File.join(framework_search_path, "#{framework}.framework")
+              if File.exist?(path)
+                @config.libs << "-force_load '#{File.join(path, framework)}'"
+              end
+            end
+          end
         end
 
         @config.weak_frameworks.concat(ldflags.scan(/-weak_framework\s+([^\s]+)/).map { |m| m[0] })

data/lib/motion/project/version.rb

@@ -24,6 +24,6 @@
 
 module Motion::Project
   class CocoaPods
-    VERSION = '1.4.2'
+    VERSION = '1.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Laurent Sansonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: CocoaPods integration for RubyMotion projects