motion-cocoapods 1.9.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '02304080ad8c8df050bae04134f15f54d9217122'
-  data.tar.gz: 216a87d5f1084b3485c144eae9e506ab89fb09f1
+SHA256:
+  metadata.gz: 671610d7c2c8b13e5a4b2387b24e2e1e9dbaf68d401c30fc992a97d045c49de4
+  data.tar.gz: 23f661ddd6890e75eb1d98c60a5a819311f81820ee6cd12176817c2e8a288433
 SHA512:
-  metadata.gz: dd89fd118d35afee62e2dcf3b0be24127864ddced1a259e1d68419e0e0b05fb6864b7e8a4bfc76d3d61f46b1ecdcc8fdb2f6bd4a1b316583b89c1b5baf7dede9
-  data.tar.gz: 8a11d98961200b72db91ddb9b5c38b24e0d1ea1980dd8b2cb639d85f6d1cfe5ca9fa6c89292b5a915191cab4f014de51c7c3660054fe6652e2b1b8e52aefe6f6
+  metadata.gz: 6eb5e34c6bcc0a8acfa014ab47b94525db25cd7e9035b40f64e06ae1d509488f27877044b2d2a1a9398d13f120f8c854b001e3241c01447d2a1e8e9fe40fd343
+  data.tar.gz: 3267bd18ced185f1c1a468a745ef5c2a3ef21112e1ae7d54130155ea3fe566eb078a9bbc97202303a77b7d85bd9a1de1fa82921ca04f2e51baa1b0401faefceb

data/lib/motion/project/cocoapods.rb

@@ -95,9 +95,11 @@ module Motion::Project
         App.fail "Unknown CocoaPods platform: #{@config.deploy_platform}"
       end
 
-      @podfile = Pod::Podfile.new(Pathname.new(Rake.original_dir) + 'Rakefile') {}
-      @podfile.platform(platform, config.deployment_target)
-      @podfile.target(TARGET_NAME)
+      @podfile = Pod::Podfile.new(Pathname.new(Rake.original_dir) + 'Rakefile') do
+        platform(platform, config.deployment_target)
+        target(TARGET_NAME)
+        install!('cocoapods', :integrate_targets => false)
+      end
       cp_config.podfile = @podfile
       cp_config.installation_root = Pathname.new(File.expand_path(config.project_dir)) + 'vendor'
 
@@ -237,12 +239,32 @@ module Motion::Project
       FileUtils.rm_rf(resources_dir)
 
       pods_installer.update = update
-      pods_installer.installation_options.integrate_targets = false
       pods_installer.install!
+      symlink_framework_headers
       install_resources
       copy_cocoapods_env_and_prefix_headers
     end
 
+    PUBLIC_HEADERS_ROOT = File.join(PODS_ROOT, 'Headers/Public')
+
+    def framework_public_headers_dir(framework_path)
+      framework_name = framework_path[%r{/([^/]*)\.framework/}, 1]
+      File.join(@config.project_dir, PUBLIC_HEADERS_ROOT, framework_name)
+    end
+
+    def symlink_framework_headers
+      framework_search_paths.each do |framework_search_path|
+        Dir.glob("#{framework_search_path}/*.framework/Headers").each do |framework_path|
+          FileUtils.mkdir_p(framework_public_headers_dir(framework_path))
+
+          Dir.glob("#{framework_path}/*.h").each do |header_path|
+            relative_path = "../../..#{header_path.sub(File.join(@config.project_dir, PODS_ROOT), '')}"
+            File.symlink(relative_path, "#{framework_public_headers_dir(framework_path)}/#{File.basename(header_path)}")
+          end
+        end
+      end
+    end
+
     # TODO this probably breaks in cases like resource bundles etc, need to test.
     #
     def install_resources
@@ -266,8 +288,6 @@ module Motion::Project
       installed_resources
     end
 
-    PUBLIC_HEADERS_ROOT = File.join(PODS_ROOT, 'Headers/Public')
-
     def copy_cocoapods_env_and_prefix_headers
       headers = Dir.glob(["#{PODS_ROOT}/*.h", "#{PODS_ROOT}/*.pch", "#{PODS_ROOT}/Target Support Files/**/*.h", "#{PODS_ROOT}/Target Support Files/**/*.pch"])
       headers.each do |header|
@@ -298,7 +318,6 @@ module Motion::Project
     end
 
     def analyzer
-      cp_config = Pod::Config.instance
       Pod::Installer::Analyzer.new(cp_config.sandbox, @podfile, cp_config.lockfile)
     end
 
@@ -473,6 +492,11 @@ module Motion::Project
             end
           end
         end
+        framework_search_paths.each do |framework_search_path|
+          Dir.glob("#{framework_search_path}/*.framework/Headers").each do |framework_path|
+            paths << framework_public_headers_dir(framework_path)
+          end
+        end
         paths
       end
 

data/lib/motion/project/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Laurent Sansonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.6.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.6.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 description: motion-cocoapods allows RubyMotion projects to have access to the CocoaPods
   dependency manager.
 email: lrz@hipbyte.com
@@ -55,8 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: CocoaPods integration for RubyMotion projects