cocoapods-fix-module 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f45e445f35ec065947fd79717584617d26c7029d
-  data.tar.gz: 51ef2924cd1566916ba1861bde88e273bcad1eb8
+  metadata.gz: 3ffe52ae83b3a589de087178508764ff0402f9f0
+  data.tar.gz: 19e1a654050283dcd33cc9035ef60597a7fba283
 SHA512:
-  metadata.gz: b6091fc4354253b62aa94be690657589d15499401a94870fd5264c3b97001ff91b9036d752aef2e53385b9b0f3351e28a62fc3ced80d44d4c001d7becc543813
-  data.tar.gz: d1c4695a22411b149c9c28fe0e146646094fdd1c30658337db96ca79d82f5d2da75e8025d2f9c6052a0a40770554a159e5379dc62875cdc848006f8663839e31
+  metadata.gz: 2c7782189a64692b7a4605bf561ce77a479ac8c4890d1bdb932660313bacc7d61b7616700bc202aaf0360d16967c14c2eb45b4551a066458615b4545080f1a6e
+  data.tar.gz: acd641a68a2b3cdadeb624e17ed2eabc9baa90717261e077ff0d231035d7f35e0ba102b5f0676c76bd60a84406edabd50ebe5d190f007336b6d3e76bc5e123cc

data/README.md

@@ -1,6 +1,12 @@
 # cocoapods-fix-module
 
-A description of cocoapods-fix-module.
+Cocoapods have a bug: doesn't generate modulemap for pure binary pod 
+
+This plugin fix this bug.
+            
+https://code.byted.org/iOS_Library/MobileDev/issues/256
+            
+
 
 ## Installation
 

data/cocoapods-fix-module.gemspec

@@ -20,4 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
+  spec.add_runtime_dependency 'cocoapods', '>= 1.5.0'
+
 end

data/lib/cocoapods-fix-module/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsFixModule
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/cocoapods-fix-module/patch1.5.rb

@@ -0,0 +1,221 @@
+
+#
+# REASON:
+#
+# When a pod only have vendored library, and the 'use_modular_header' is on, cocoapods won't
+# generate a modulemap (so module is not working), beacause it consider it as "should_build? == false".
+#
+# It's a bug of cocoapods.
+#
+# We fix it by changing the `install!` method:
+#
+#    when a pod is (target.should_build? == true && target.uses_modular_headers?),
+#    we treat it differently: like nomarl pods,
+#       - create_umbrella_header
+#       - create_module_map
+#
+#
+module Pod
+  class Installer
+    class Xcode
+      class PodsProjectGenerator
+        class PodTargetInstaller
+
+
+          FIX_MODULE_OLD_install = instance_method(:install!)
+          define_method(:install!) do
+
+              if (not target.should_build?) && target.send(:uses_modular_headers?)
+                  # special handling for pod with no source code
+
+                  # Most code below are copied from original install! method
+                  # Manually checked the 1.5.3/ 1.5.2/ 1.5.1/ 1.5.0, they are all the same. So it's safe.
+                  UI.message "- Installing target `#{target.name}` #{target.platform}" do
+                    add_target
+                    create_support_files_dir
+
+                    add_resources_bundle_targets
+                    create_xcconfig_file
+
+                    if target.defines_module?
+                      create_module_map do |generator|
+                        generator.headers.concat module_map_additional_headers
+                      end
+                      create_umbrella_header do |generator|
+                        file_accessors = target.file_accessors
+                        file_accessors = file_accessors.reject { |f| f.spec.test_specification? } if target.contains_test_specifications?
+                        generator.imports += if header_mappings_dir
+                                               file_accessors.flat_map(&:public_headers).map do |pathname|
+                                                 pathname.relative_path_from(header_mappings_dir)
+                                               end
+                                             else
+                                               file_accessors.flat_map(&:public_headers).map(&:basename)
+                                             end
+                      end
+                    end
+
+                    if target.requires_frameworks?
+                      unless target.static_framework?
+                        create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform)
+                      end
+                      create_build_phase_to_symlink_header_folders
+                    elsif target.uses_swift?
+                      add_swift_static_library_compatibility_header_phase
+                    end
+
+                  end
+
+              else
+                  # call original
+                  FIX_MODULE_OLD_install.bind(self).()
+              end
+
+          end # patch ended
+
+
+        end
+      end
+    end
+  end
+end
+
+
+
+
+
+module Pod
+  class Installer
+    class Xcode
+      class PodsProjectGenerator
+
+
+            # override
+            #
+            # Manually checked the 1.5.3/ 1.5.2/ 1.5.1/ 1.5.0, they are all the same. So it's safe.
+            #
+            def install_libraries
+              UI.message '- Installing targets' do
+                umbrella_headers_by_dir = pod_targets.map do |pod_target|
+                  ## ---- modified
+                  # next unless pod_target.should_build? && pod_target.defines_module?
+                  next unless pod_target.defines_module?
+                  next unless (pod_target.should_build? || pod_target.send(:uses_modular_headers?) )
+                  ## ---- modifed end
+                  #
+                  # contentx below is copied from original method
+
+                  pod_target.umbrella_header_path
+                end.compact.group_by(&:dirname)
+
+                pod_targets.sort_by(&:name).each do |pod_target|
+                  target_installer = PodTargetInstaller.new(sandbox, pod_target)
+                  target_installer.umbrella_headers_by_dir = umbrella_headers_by_dir
+                  target_installer.install!
+                end
+
+                aggregate_targets.sort_by(&:name).each do |target|
+                  target_installer = AggregateTargetInstaller.new(sandbox, target)
+                  target_installer.install!
+                end
+
+                add_system_framework_dependencies
+              end
+            end
+
+      end
+    end
+  end
+end
+
+
+
+module Pod
+  module Generator
+    module XCConfig
+      module XCConfigHelper
+
+              # override
+              #
+              # Manually checked the 1.5.3/ 1.5.2/ 1.5.1, they are all the same. So it's safe.
+              # 1.5.0 is slightly different at Line 147 (`dependent_targets.uniq.combination(2) do |a, b|`)
+              # with no `uniq`, but I think it's not a problem.
+              #
+              def self.search_paths_for_dependent_targets(target, dependent_targets, test_xcconfig = false)
+                ## ---- modified
+                # dependent_targets = dependent_targets.select(&:should_build?)
+                dependent_targets = dependent_targets.select { |target| target.should_build? || target.send(:uses_modular_headers?) }
+                ## ---- modifed end
+                #
+                # contentx below is copied from original method
+
+                # Filter out dependent targets that are subsets of another target.
+                subset_targets = []
+                dependent_targets.uniq.combination(2) do |a, b|
+                  if (a.specs - b.specs).empty?
+                    subset_targets << a
+                  elsif (b.specs - a.specs).empty?
+                    subset_targets << b
+                  end
+                end
+                dependent_targets -= subset_targets
+
+                # Alias build dirs to avoid recursive definitions for pod targets and depending
+                # on build settings which could be overwritten in the user target.
+                build_settings = {
+                    BUILD_DIR_VARIABLE[2..-2] => '${BUILD_DIR}',
+                    CONFIGURATION_BUILD_DIR_VARIABLE[2..-2] => "#{BUILD_DIR_VARIABLE}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)",
+                }
+
+                # Scope pod targets as long as they are not test targets.
+                if !test_xcconfig && target.respond_to?(:configuration_build_dir)
+                  build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)
+                end
+
+                module_map_files = []
+                unless dependent_targets.empty?
+                  framework_search_paths = []
+                  library_search_paths = []
+                  swift_import_paths = []
+                  dependent_targets.each do |dependent_target|
+                    if dependent_target.requires_frameworks?
+                      framework_search_paths << dependent_target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)
+                    else
+                      ### -------------- modified ---------------
+                      # library_search_paths << dependent_target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)
+                      # --- to ----
+                      if dependent_target.should_build?
+                        library_search_paths << dependent_target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE)
+                      end
+                      ### -------------- \modified ---------------
+                      if dependent_target.defines_module?
+                        module_map_file = if dependent_target.uses_swift?
+                                            # for swift, we have a custom build phase that copies in the module map, appending the .Swift module
+                                            "${PODS_CONFIGURATION_BUILD_DIR}/#{dependent_target.label}/#{dependent_target.product_module_name}.modulemap"
+                                          else
+                                            "${PODS_ROOT}/#{dependent_target.module_map_path.relative_path_from(dependent_target.sandbox.root)}"
+                                          end
+                        module_map_files << %(-fmodule-map-file="#{module_map_file}")
+                        swift_import_paths << dependent_target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE) if dependent_target.uses_swift?
+                      end
+                    end
+                  end
+                  build_settings['FRAMEWORK_SEARCH_PATHS'] = XCConfigHelper.quote(framework_search_paths.uniq)
+                  build_settings['LIBRARY_SEARCH_PATHS']   = XCConfigHelper.quote(library_search_paths.uniq)
+                  build_settings['SWIFT_INCLUDE_PATHS']    = XCConfigHelper.quote(swift_import_paths.uniq)
+                end
+
+                other_swift_flags = module_map_files.tap(&:uniq!).flat_map { |f| ['-Xcc', f] }
+                if target.is_a?(PodTarget) && !target.requires_frameworks? && target.defines_module? && !test_xcconfig
+                  # make it possible for a mixed swift/objc static library to be able to import the objc from within swift
+                  other_swift_flags += ['-import-underlying-module', '-Xcc', '-fmodule-map-file="${SRCROOT}/${MODULEMAP_FILE}"']
+                end
+                # unconditionally set these, because of (the possibility of) having to add the pod targets own module map file
+                build_settings['OTHER_CFLAGS']           = module_map_files.join(' ')
+                build_settings['OTHER_SWIFT_FLAGS']      = other_swift_flags.join(' ')
+
+                build_settings
+              end
+      end
+    end
+  end
+end

data/lib/cocoapods_plugin.rb

@@ -1,4 +1,9 @@
 
 Pod::HooksManager.register('cocoapods-fix-module', :pre_install) do |installer_context|
-    require 'cocoapods-fix-module/patch'
+    if Pod::VERSION.start_with? "1.5"
+        require 'cocoapods-fix-module/patch1.5'
+    else
+        # 1.6 or above
+        require 'cocoapods-fix-module/patch'
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fix-module
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Leavez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cocoapods
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: A short description of cocoapods-fix-module.
 email:
 - gaojiji@gmail.com
@@ -54,6 +68,7 @@ files:
 - lib/cocoapods-fix-module.rb
 - lib/cocoapods-fix-module/gem_version.rb
 - lib/cocoapods-fix-module/patch.rb
+- lib/cocoapods-fix-module/patch1.5.rb
 - lib/cocoapods_plugin.rb
 - spec/command/module_spec.rb
 - spec/spec_helper.rb