pod-builder 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c6275f3a40b0b245434453e3b7a0f65e58e67bd5014cc5e51f6bfb150293bad
-  data.tar.gz: f521cdbb64dbce74c33ffad91b256766c770f1f42ec3a77e1cf1d07c6bdbaa5e
+  metadata.gz: 2543ea37db6acf1d514a3fb124d57828402cc1317b6af224021cbd051ad078e5
+  data.tar.gz: 15c5d80d10832f30057af56ddb76c4ae1b5d4567611e75ce06dffff76b707a5b
 SHA512:
-  metadata.gz: df5f8f23b4d9eb6af7d9a9aed757aa0f1ea71414d0b8dcdf872f1b7bcf21d425ac48d242901d90a73a05d2a794c026613af6741f205b3ee01b47c610e7e004a0
-  data.tar.gz: d3688d9b6fa5b0e475f0065017cfcc156e4d888c1ecd7f707c651a7623a025c58b046baae24ee41bf5e7a16e6763d7c1605f06d82eb40122fc207972d733d880
+  metadata.gz: 8a5f4e4949cd05a606e7c35816f4e5feb267ce35ed296c6ed6c627ec7b5ba79d912afa5c323e196d0b3306d54366e732896082909ed838e8ed60475f00fe3b04
+  data.tar.gz: 2dc996a6014ae9ba8f2a16ad8d1f20a049c776042c4d7bf592fe5597c7dc6a33c5c001c48e0caaabfb744f3e552fd24127c2b20cff23160aaa5f6b7d9b87378e

data/lib/pod_builder/install.rb

@@ -1,7 +1,7 @@
 require 'cfpropertylist'
 
-
-# We swizzle the analyzer to inject spec overrides
+# We swizzle the analyzer to inject spec overrides. This might no longer be needed
+# given that we're swizzling the Pod::Downloader as well
 class Pod::Specification::Linter::Analyzer
   alias_method :swz_analyze, :analyze
 
@@ -18,7 +18,6 @@ class Pod::Specification::Linter::Analyzer
 end
 
 Pod::Downloader.singleton_class.send(:alias_method, :swz_download, :download)
-
 module Pod::Downloader
   def self.download(
     request,
@@ -38,6 +37,47 @@ module Pod::Downloader
   end
 end
 
+# The Pod::Target and Pod::Installer::Xcode::PodTargetDependencyInstaller swizzles patch
+# the following issues: 
+# - https://github.com/CocoaPods/Rome/issues/81
+# - https://github.com/leavez/cocoapods-binary/issues/50
+begin
+  require 'cocoapods/installer/xcode/pods_project_generator/pod_target_dependency_installer.rb'
+
+  class Pod::Target
+    attr_accessor :mock_dynamic_framework
+
+    alias_method :swz_build_type, :build_type
+
+    def build_type
+      if mock_dynamic_framework == true
+        if defined?(Pod::BuildType) # CocoaPods 1.9 and later
+          Pod::BuildType.new(linkage: :dynamic, packaging: :framework)
+        elsif defined?(Pod::Target::BuildType) # CocoaPods 1.7, 1.8
+          Pod::Target::BuildType.new(linkage: :dynamic, packaging: :framework)
+        else
+          raise "BuildType not found. Open an issue reporting your CocoaPods version"
+        end
+      else
+        swz_build_type()
+      end
+    end
+  end
+
+  class Pod::Installer::Xcode::PodTargetDependencyInstaller
+    alias_method :swz_wire_resource_bundle_targets, :wire_resource_bundle_targets
+  
+    def wire_resource_bundle_targets(resource_bundle_targets, native_target, pod_target)
+      pod_target.mock_dynamic_framework = pod_target.build_as_static_framework?
+      res = swz_wire_resource_bundle_targets(resource_bundle_targets, native_target, pod_target)
+      pod_target.mock_dynamic_framework = false
+      return res
+    end
+  end  
+rescue
+  # CocoaPods 1.6.2 or earlier
+end
+
 module PodBuilder
   class Install
     def self.podfile(podfile_content, podfile_items, build_configuration)

data/lib/pod_builder/podfile.rb

@@ -99,6 +99,9 @@ module PodBuilder
           end
         }
       end
+      
+      multiple_buildable_items = podfile_items.uniq { |t| t.root_name }
+      buildable_items = podfile_items.reject { |t| multiple_buildable_items.map(&:root_name).include?(t.root_name) && t.is_external == false }
 
       result_targets = analyzer.instance_variable_get("@result").targets.map(&:name) 
       podfile_content = ["# Autogenerated by PodBuilder (https://github.com/Subito-it/PodBuilder)", "# Please don't modify this file", "\n"]
@@ -125,7 +128,9 @@ module PodBuilder
 
         specifications.each do |spec|
           item = podfile_items.detect { |x| x.name == spec.name }
-          podfile_content.push("\t#{item.entry}")
+          if buildable_items.map(&:name).include?(spec.name)
+            podfile_content.push("\t#{item.entry}")
+          end
         end
 
         podfile_content.push("end\n")

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler