cocoapods-fix-module 0.0.7 → 0.1.1

data/DEMO/Podfile

@@ -0,0 +1,30 @@
+# 建议使用 bundle exec pod install 代替 pod install，可以统一相关 ruby gem 的版本
+platform :ios, '9.0'
+#use_frameworks!
+# add additional config here
+
+require 'bd_pod_extentions'
+# 使用组件源（必要）
+# bd_pod_extentions 更多介绍 https://mobile.bytedance.net/docs/manual/17033/
+bd_use_app('public', 'thirdParty')
+
+# 全部使用源代码
+#bd_use_source!
+
+
+# 静态库下使用 module (使可以在 swift 代码里直接 import PodName)
+use_modular_headers!
+plugin 'cocoapods-fix-module' # 修复 objc binary pod 在 use_modular_headers 时仍没有 module 的问题
+
+
+
+
+target 'DEMO' do
+
+  # add pod here
+   pod_binary 'lottie-ios' , '2.1.5'
+  pod_binary 'Masonry', '1.1.0'
+  # pod 'Literal', path: '~/byte/test/Literal2'
+
+
+end

data/DEMO/Podfile.lock

@@ -0,0 +1,20 @@
+PODS:
+  - lottie-ios (2.1.5.1-binary)
+  - Masonry (1.1.0.1-binary)
+
+DEPENDENCIES:
+  - lottie-ios (= 2.1.5.1-binary)
+  - Masonry (= 1.1.0.1-binary)
+
+SPEC REPOS:
+  "git@code.byted.org:iOS_Library/publicthird_binary_repo.git":
+    - lottie-ios
+    - Masonry
+
+SPEC CHECKSUMS:
+  lottie-ios: f2b8cad625e57b90974a282efac4fce375ba3860
+  Masonry: c9cef972c6546901fe6e8900688ffa5e55175005
+
+PODFILE CHECKSUM: 2802dd81cd0910852de0997259f9bf8681f0ccef
+
+COCOAPODS: 1.8.3

data/Gemfile.lock

@@ -0,0 +1,105 @@
+PATH
+  remote: .
+  specs:
+    cocoapods-fix-module (0.1.1)
+      cocoapods (>= 1.6.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.1)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    bacon (1.2.0)
+    claide (1.0.3)
+    cocoapods (1.8.1)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.8.1)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.6.6)
+      nap (~> 1.0)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.1)
+      activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.2.2)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.4.1)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.1.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.5)
+    escape (0.0.4)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    metaclass (0.0.4)
+    minitest (5.12.2)
+    mocha (1.9.0)
+      metaclass (~> 0.0.1)
+    mocha-on-bacon (0.2.3)
+      mocha (>= 0.13.0)
+    molinillo (0.6.6)
+    nanaimo (0.2.6)
+    nap (1.1.0)
+    netrc (0.11.0)
+    prettybacon (0.0.2)
+      bacon (~> 1.2)
+    rake (13.0.0)
+    ruby-macho (1.4.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    xcodeproj (1.12.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bacon
+  bundler
+  cocoapods
+  cocoapods-fix-module!
+  mocha
+  mocha-on-bacon
+  prettybacon
+  rake
+
+BUNDLED WITH
+   2.0.2

data/cocoapods-fix-module.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_runtime_dependency 'cocoapods', '>= 1.6.0'
 

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

@@ -1,3 +1,3 @@
 module CocoapodsFixModule
-  VERSION = "0.0.7"
+  VERSION = "0.1.1"
 end

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

@@ -0,0 +1,20 @@
+
+
+# 目前的改法对于 1.7 / 1.8，是没有考虑 app spec 的东西的，所以显示不支持
+Pod::HooksManager.register('cocoapods-fix-module', :post_install) do |installer_context|
+    pod_name = nil
+    has_app_spec = installer_context.umbrella_targets.any? do |umbrella_target|
+        umbrella_target.specs.any? do |spec|
+            if spec.app_specs.length > 0
+                pod_name = spec.name
+                next true
+            end
+        end
+    end
+    if has_app_spec
+        puts "[!] ERROR: Plugin cocoapods-fix-module, doesn't supports pods whose spec contain app_spec. Invalid pods: #{pod_name}".red
+        puts "Reference: https://guides.cocoapods.org/syntax/podspec.html#app_spec".red
+        puts "Install failed !!".red
+        exit 1
+    end
+end

data/lib/cocoapods-fix-module/{patch.rb → patch1.6.rb}

@@ -9,31 +9,13 @@
 #
 # We fix it by changing the `install!` method:
 #
-#    when a pod is (target.should_build? == true && target.uses_modular_headers?),
+#    when a pod is (target.should_build? == true && target.define_module?),
 #    we treat it differently: like normal pods,
 #       - create_umbrella_header
 #       - create_module_map
 #
 
-module Pod
-  class PodTarget
-
-    def contain_vendored_libraries_and_no_vendored_frameworks?
-      return @uses_libraries_no_frameworks if defined? @uses_libraries_no_frameworks
-      @uses_libraries_no_frameworks = begin
-        accessors = file_accessors.reject { |a| a.spec.test_specification? }
-        !accessors.empty? && accessors.all?{ |a| a.vendored_frameworks.blank? } && accessors.any?{ |a| not a.vendored_libraries.blank? }
-      end
-    end
-
-    def should_generate_module_map_for_a_pod_should_not_build?
-      @should_generate_module_map_for_a_pod_should_not_build ||= begin
-        self.uses_modular_headers? && contain_vendored_libraries_and_no_vendored_frameworks?
-      end
-    end
-
-  end
-end
+require_relative 'patch_common'
 
 module Pod
   class Installer
@@ -49,6 +31,7 @@ module Pod
                   # special handling for pod with no source code
 
                   # Most code below are copied from original install! method
+                  # Manually checked the 1.6.0/ 1.6.1, they are all the same. So it's safe.
                   native_target = add_target
                   _, file_accessors = target.file_accessors.partition { |fa| fa.spec.test_specification? }
                   resource_bundle_targets = add_resources_bundle_targets(file_accessors).values.flatten
@@ -108,45 +91,4 @@ end
 
 
 
-module Pod
-  class Target
-    # @since 1.5.0
-    class BuildSettings
-
-        class PodTargetSettings
-
-              # Patch (because there is a should_build? check)
-              #
-              FIX_MODULE_OLD_module_map_file_to_import = instance_method(:module_map_file_to_import)
-              define_method(:module_map_file_to_import) do
-
-                if (not target.should_build?) && target.should_generate_module_map_for_a_pod_should_not_build?
-                    # ---- Code bellow is copied form the original method ----
-                    #
-                    # ---------------- this line is deleted ------------------
-                    # return unless target.should_build?
-                    # -------------------------------------------------------
-                    #
-                    return if target.requires_frameworks?
-                    return unless target.defines_module?
-
-                    if 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}/#{target.label}/#{target.product_module_name}.modulemap"
-                    else
-                      "${PODS_ROOT}/#{target.module_map_path.relative_path_from(target.sandbox.root)}"
-                    end
-                    # ---- Code above is copied form the original method ----
-                else
-                    # call original
-                    FIX_MODULE_OLD_module_map_file_to_import.bind(self).()
-                end
-
-              end # patch ended
-
-        end
-
-    end
-  end
-end
 

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

@@ -0,0 +1,95 @@
+
+#
+# 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), because 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.define_module?),
+#    we treat it differently: like normal pods,
+#       - create_umbrella_header
+#       - create_module_map
+#
+
+require_relative 'patch_common'
+require_relative 'hint_no_app_target_support'
+
+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.should_generate_module_map_for_a_pod_should_not_build?
+                            # special handling for pod with no source code
+
+                            # Most code below are copied from original install! method
+                            # Manually checked the 1.7.0 ~ 1.7.5, they are all the same. So it's safe.
+                            native_target = add_target
+                            library_file_accessors = target.file_accessors.select { |fa| fa.spec.library_specification? }
+                            resource_bundle_targets = add_resources_bundle_targets(library_file_accessors).values.flatten
+                            create_xcconfig_file(native_target, resource_bundle_targets)
+
+                            if target.defines_module?
+                                create_module_map(native_target) do |generator|
+                                    generator.headers.concat module_map_additional_headers
+                                end
+                                create_umbrella_header(native_target) do |generator|
+                                    generator.imports += library_file_accessors.flat_map do |file_accessor|
+                                        header_dir = if !target.build_as_framework? && dir = file_accessor.spec_consumer.header_dir
+                                                         Pathname.new(dir)
+                                                     end
+
+                                        file_accessor.public_headers.map do |public_header|
+                                            public_header = if header_mappings_dir
+                                                                public_header.relative_path_from(header_mappings_dir)
+                                                            else
+                                                                public_header.basename
+                                                            end
+                                            if header_dir
+                                                public_header = header_dir.join(public_header)
+                                            end
+                                            public_header
+                                        end
+                                    end
+                                end
+                            end
+
+
+                            if target.build_as_framework?
+                                unless skip_info_plist?(native_target)
+                                    create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform)
+                                end
+                                create_build_phase_to_symlink_header_folders(native_target)
+                            end
+
+                            if target.build_as_library? && target.uses_swift?
+                                add_swift_library_compatibility_header_phase(native_target)
+                            end
+
+                            clean_support_files_temp_dir
+                            TargetInstallationResult.new(target, native_target, resource_bundle_targets)
+
+
+                        else
+                            # call original
+                            FIX_MODULE_OLD_install.bind(self).()
+                        end
+
+                    end # patch ended
+
+                end
+            end
+        end
+    end
+end
+
+

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

@@ -0,0 +1,95 @@
+
+#
+# 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), because 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.define_module?),
+#    we treat it differently: like normal pods,
+#       - create_umbrella_header
+#       - create_module_map
+#
+
+require_relative 'patch_common'
+require_relative 'hint_no_app_target_support'
+
+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.should_generate_module_map_for_a_pod_should_not_build?
+                            # special handling for pod with no source code
+
+                            # Most code below are copied from original install! method
+                            # Manually checked the 1.8.1/ 1.8.3, they are all the same. So it's safe.
+                            native_target = add_target
+                            library_file_accessors = target.file_accessors.select { |fa| fa.spec.library_specification? }
+                            resource_bundle_targets = add_resources_bundle_targets(library_file_accessors).values.flatten
+                            create_xcconfig_file(native_target, resource_bundle_targets)
+
+                            if target.defines_module?
+                                create_module_map(native_target) do |generator|
+                                    generator.headers.concat module_map_additional_headers
+                                end
+                                create_umbrella_header(native_target) do |generator|
+                                    generator.imports += library_file_accessors.flat_map do |file_accessor|
+                                        header_dir = if !target.build_as_framework? && dir = file_accessor.spec_consumer.header_dir
+                                                         Pathname.new(dir)
+                                                     end
+
+                                        file_accessor.public_headers.map do |public_header|
+                                            public_header = if header_mappings_dir(file_accessor)
+                                                                public_header.relative_path_from(header_mappings_dir(file_accessor))
+                                                            else
+                                                                public_header.basename
+                                                            end
+                                            if header_dir
+                                                public_header = header_dir.join(public_header)
+                                            end
+                                            public_header
+                                        end
+                                    end
+                                end
+                            end
+
+
+                            if target.build_as_framework?
+                                unless skip_info_plist?(native_target)
+                                    create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform, :additional_entries => target.info_plist_entries)
+                                end
+                                create_build_phase_to_symlink_header_folders(native_target)
+                            end
+
+                            if target.build_as_library? && target.uses_swift?
+                                add_swift_library_compatibility_header_phase(native_target)
+                            end
+
+                            clean_support_files_temp_dir
+                            TargetInstallationResult.new(target, native_target, resource_bundle_targets)
+
+
+                        else
+                            # call original
+                            FIX_MODULE_OLD_install.bind(self).()
+                        end
+
+                    end # patch ended
+
+                end
+            end
+        end
+    end
+end
+
+