motion-cocoapods 1.8.0.beta.4 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cf4d1301aaea8107392c5407c1b142693052649
-  data.tar.gz: fba6b47570ddecb3eec7afe13d2b534ea5e7ffd1
+  metadata.gz: 31000f79b0614f320e1448afdf2f84030d9fbcb3
+  data.tar.gz: ec41d1977dfd31860512c25031cc0c6b0350166d
 SHA512:
-  metadata.gz: b18a7ddae094f2fce3a02a1b42de81fe7326564ddba364f7a00f01dc27c353733c7414d7dddd828df52eddb4dcd29ab67d30b27405da6a6774960aadc00d0e80
-  data.tar.gz: f7b4d7072c224c37bb9c89e73bd39d63e8e54316bb58cf192ad839437b20e811f4e67155cf58c6b51fb32fbc8ef2f6bd9106ef9eafc5a2d7cd74ee32d345ab86
+  metadata.gz: c487c9cf07c442ecdbf8c71a255f492bda6e5065259e311d2f7dc234523d42e7a0d3fcbd53452fe3fab71be5a313197eb3c23e6f6de851712c1b33865f98d294
+  data.tar.gz: 56eb0f22b268f753d5c70aea03e13e3812639cf9d630d9d4e40f713e9e70b2340cc596fc6740d291a9ddfa0a9ec6f0f438592f063ceb30f85dcff4c716fb194c

data/lib/motion/project/cocoapods.rb

@@ -107,7 +107,7 @@ module Motion::Project
         lib_search_path_flags = xcconfig['LIBRARY_SEARCH_PATHS'] || ""
         lib_search_paths = []
         lib_search_path_flags = lib_search_path_flags.split(/\s/).map do |path|
-          if path =~ /(\$\(inherited\))|(\$\{inherited\})/
+          if path =~ /(\$\(inherited\))|(\$\{inherited\})|(\$CONFIGURATION_BUILD_DIR)/
             nil
           else
             path = path.gsub(/(\$\(PODS_ROOT\))|(\$\{PODS_ROOT\})/, File.join(@config.project_dir, PODS_ROOT))
@@ -160,6 +160,29 @@ module Motion::Project
         end
 
         header_dirs = ['Headers/Public']
+
+        # We want to set the proper header search paths otherwise we might generate incorrect bridgesupport
+        header_search_paths = []
+        if search_paths = xcconfig['HEADER_SEARCH_PATHS']
+          search_paths = search_paths.strip
+          unless search_paths.empty?
+            search_paths.scan(/"([^"]+)"/) do |search_path|
+              path = search_path.first.gsub!(/(\$\(PODS_ROOT\))|(\$\{PODS_ROOT\})/, "#{@config.project_dir}/#{PODS_ROOT}")
+              header_search_paths << File.expand_path(path) if path
+            end
+            # If we couldn't parse any search paths, then presumably nothing was properly quoted, so
+            # fallback to just assuming the whole value is one path.
+            if header_search_paths.empty?
+              path = search_paths.gsub!(/(\$\(PODS_ROOT\))|(\$\{PODS_ROOT\})/, "#{@config.project_dir}/#{PODS_ROOT}")
+              header_search_paths << File.expand_path(path) if path
+            end
+          end
+        end
+        header_search_paths = header_search_paths.map { |p| "-I'#{p}'" }.join(' ')
+        # Initialize ':bridgesupport_cflags', in case the use
+        @vendor_options[:bridgesupport_cflags] ||= ''
+        @vendor_options[:bridgesupport_cflags] << " #{header_search_paths}"
+
         frameworks = ldflags.scan(/-framework\s+"?([^\s"]+)"?/).map { |m| m[0] }
 
         case @config.deploy_platform
@@ -189,13 +212,6 @@ module Motion::Project
               path = File.join(framework_search_path, "#{framework}.framework")
               if File.exist?(path)
                 @config.libs << "-ObjC '#{File.join(path, framework)}'"
-                # This is needed until (and if) CocoaPods links framework
-                # headers into `Headers/Public` by default:
-                #
-                #   https://github.com/CocoaPods/CocoaPods/pull/2722
-                #
-                header_dir = Pathname.new(path) + 'Headers'
-                header_dirs << header_dir.realpath.relative_path_from(pods_root).to_s
                 true
               else
                 false

data/lib/motion/project/version.rb

@@ -24,6 +24,6 @@
 
 module Motion::Project
   class CocoaPods
-    VERSION = '1.8.0.beta.4'
+    VERSION = '1.8.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.8.0.beta.4
+  version: 1.8.0
 platform: ruby
 authors:
 - Laurent Sansonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.7
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.7
+        version: 1.0.0
 description: motion-cocoapods allows RubyMotion projects to have access to the CocoaPods
   dependency manager.
 email: lrz@hipbyte.com
@@ -51,12 +51,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: CocoaPods integration for RubyMotion projects