cocoapods-fix-module 0.0.7 → 0.1.1

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

@@ -0,0 +1,67 @@
+
+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.defines_module? && contain_vendored_libraries_and_no_vendored_frameworks?
+            end
+        end
+
+    end
+end
+
+
+
+
+module Pod
+    class Target
+        # @since 1.5.0
+        # checked 1.6 1.7 1.8
+        # except `requires_frameworks?` is renamed to `build_as_framework?`, but is have an alias.
+        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_plugin.rb

@@ -1,9 +1,14 @@
 
 Pod::HooksManager.register('cocoapods-fix-module', :pre_install) do |installer_context|
-    # if Pod::VERSION.start_with? "1.5"
-    #     require 'cocoapods-fix-module/patch1.5'
-    # else
-        # 1.6 or above
-        require 'cocoapods-fix-module/patch'
-    # end
+    if Pod::VERSION.start_with? "1.6."
+        require 'cocoapods-fix-module/patch1.6'
+    elsif Pod::VERSION.start_with? "1.7."
+        require 'cocoapods-fix-module/patch1.7'
+    elsif Pod::VERSION.start_with? "1.8."
+        require 'cocoapods-fix-module/patch1.8'
+    else
+        Pod::UI.warn "cocoapods-fix-module have not been tested for Cocoapods #{Pod::VERSION}, use at your own risk"
+        require 'cocoapods-fix-module/patch1.8'
+    end
 end
+

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fix-module
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.1
 platform: ruby
 authors:
 - Leavez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -60,15 +60,38 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- DEMO/.bundle/config
+- DEMO/.gitignore
+- DEMO/DEMO.xcodeproj/project.pbxproj
+- DEMO/DEMO.xcworkspace/contents.xcworkspacedata
+- DEMO/DEMO.xcworkspace/pod.json
+- DEMO/DEMO/AppDelegate.swift
+- DEMO/DEMO/Assets.xcassets/AppIcon.appiconset/Contents.json
+- DEMO/DEMO/Assets.xcassets/Contents.json
+- DEMO/DEMO/Base.lproj/LaunchScreen.storyboard
+- DEMO/DEMO/Info.plist
+- DEMO/DEMO/ViewController.swift
+- DEMO/DEMO/demos/BDWebImage_demo.m
+- DEMO/DEMOTests/DEMOTests.swift
+- DEMO/DEMOTests/Info.plist
+- DEMO/Gemfile
+- DEMO/Gemfile.lock
+- DEMO/Podfile
+- DEMO/Podfile.lock
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - cocoapods-fix-module.gemspec
 - lib/cocoapods-fix-module.rb
 - lib/cocoapods-fix-module/gem_version.rb
-- lib/cocoapods-fix-module/patch.rb
+- lib/cocoapods-fix-module/hint_no_app_target_support.rb
 - lib/cocoapods-fix-module/patch1.5.rb
+- lib/cocoapods-fix-module/patch1.6.rb
+- lib/cocoapods-fix-module/patch1.7.rb
+- lib/cocoapods-fix-module/patch1.8.rb
+- lib/cocoapods-fix-module/patch_common.rb
 - lib/cocoapods_plugin.rb
 - spec/command/module_spec.rb
 - spec/spec_helper.rb