cocoapods-fix-module 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c8cc782f3225da99e9859a9e3e2de9266121d88
-  data.tar.gz: 1cdf07f68c9c9507d8991824c8cc8956192d10fd
+  metadata.gz: 7b8a1bd8d8eaf1ca31e5ecbfab3fe0ba8e210829
+  data.tar.gz: 7ce1d7156c9c52d113bc1ee2e321cf92793a9525
 SHA512:
-  metadata.gz: ab443fe71711f43b4fd48afabc149f7c526f98ddbf0c5e65020c776fc8252184cb69c676035ca9c93cf7a495920a8f17ef63c92b43215e6de8b208558f73c1ab
-  data.tar.gz: 3040ef64c06268aaa6ac5a49889353cadbdb4f15c5d4ea5e9cdf450238048aba5ac15ccc0babcb2b8205e0b144e062272733aad4d56dfe3ffb56d69376594800
+  metadata.gz: fe1229733fa16a9bc1c908060ef2161e05b38889b0ee1759a85e48e62bfd6f1c6a138145420fe42ff728c7f9ff6108f529033a5c3507bde8893cd295efc99b28
+  data.tar.gz: 9501100d321a09e59a65c58a8ac06d5ced5d5f58f6d0e91443f248abdb1480f9eb7fb11e8c178de85629d8e8f3955007b1f3ee1933deb90f9f8f1ae190478220

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

@@ -1,3 +1,3 @@
 module CocoapodsFixModule
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

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

@@ -2,78 +2,155 @@
 #
 # REASON:
 #
-# When a pod only have vendored library, and the 'use_modular_header' is on, cocoapods won't 
+# 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 patch the should_build? method.
-# When should_build? == true, it will add
-#  - dummy_source file to compile
-#  - prefix header
-#  - modulemap file
-#  - link the library, set the OTHER_SWIFT_FLAG (to use module -fmodule-map-file)
+# 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 PodTarget 
-
-        # when using modular header, should_build? should return YES
-        alias_method  :FIX_MODULE_old_should_build? , :should_build?
-        def should_build?
-            return @FIX_MODULE_saved_should_build if defined? @FIX_MODULE_saved_should_build
-            if uses_modular_headers?
-                @FIX_MODULE_saved_should_build = true
-                return @FIX_MODULE_saved_should_build
-            else
-                return FIX_MODULE_old_should_build?()
-            end
-        end
+  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
+                  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
+                  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 += file_accessors.flat_map do |file_accessor|
+                        header_dir = if !target.requires_frameworks? && 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.requires_frameworks?
+                    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)
+                  elsif target.uses_swift?
+                    add_swift_static_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
 
 
-# Vendored library whill usually have the same name with the pod name,
-# so the .a file may have a confict name, as the dummy source will create a .a file
-# We override the dummy .a file's name
-# NOTE: it will affect all the lib name generated by cocoapods
+
 module Pod
-    class Target
-        def static_library_name
-          "lib#{label}_fixModule.a"
+  class Target
+    # @since 1.5.0
+    class BuildSettings
+
+        class PodTargetSettings
+
+              # Patch (because there is a shuld_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.send(:uses_modular_headers?)
+                    # ---- 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
 
 
+
+
 # Depress the checking
-# Beacuse the target have no source to build even when should_build? == true,
+# Because the target have no source to build even when should_build? == true,
 #  which break the validation.
 module Pod
   class Installer
     class Xcode
       class PodsProjectGenerator
         class PodTargetInstaller
-          
-            def validate_targets_contain_sources(args)
-              # do nothing
-            end
+
+          def validate_targets_contain_sources(args)
+            # do nothing
+          end
 
         end
+      end
     end
   end
 end
-end
 
-                # skip creating dummy source if no build files
-                # FIX_MODULE_old_create_dummy_source = instance_method(:create_dummy_source)
-                # define_method(:create_dummy_source) do |native_target|
-
-                #     if not target.FIX_MODULE_old_should_build? 
-                #         # when nothing to build, don't create dummy source
-                #     else
-                #         FIX_MODULE_old_create_dummy_source.bind(self).(native_target)
-                #     end
-                # end
-                
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fix-module
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Leavez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler