pod-builder 4.4.5 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 206523829a1e643a482035efc05301e608b0516278c4f7edf8de424bc5fc5437
-  data.tar.gz: 6b4297d656723d6f73bf2f0972485b9e2fcb717937a86e1191f943e69f4042da
+  metadata.gz: 6509579a498f83ab8b171004c0b3096a306b85b547392c2a6e16525d5f976fe9
+  data.tar.gz: 66bd6e1a6bf224b02ec05dbd51e5001ad0f2c29aa03baba43037e7d4616057fe
 SHA512:
-  metadata.gz: 4ce7485f856f3be1f1b0f2a9a96144c9fe9eaadb1ccfd8d0db0be8019cb24e598a917baf376aaee6b5ef6c0a89f79228125e5b5cec75fd6b415cb4bd01878e0c
-  data.tar.gz: 6e1a110a204c3cb7e41803590743b6c5f1515ad16aafa0f05afd7ad167853f700d8029b18aec423dae2f3efe6ec22e822a653e3afc2b455835c3446666dab749
+  metadata.gz: bbd9e59727c97c102429d4af1fe1b6a2c2e67c8b4460fd52582b6b3f0410abb6788340c3821d931d46524795a67e13102612f3444e9e44c2c4078840c13ab13e
+  data.tar.gz: 59ff68c1e2b9130f647d25152ad9729105ffbc55e3e77d89e0221bf6bc06da45d612d258e46f1102e0f8d1e20cdb47704c88256b4ecbf0bba33593efed8184cc

data/lib/pod_builder/command/build.rb

@@ -150,8 +150,6 @@ module PodBuilder
 
         Podfile::install
 
-        sanity_checks
-
         if (restore_file_error = restore_file_error) && Configuration.restore_enabled
           puts "\n\n⚠️ Podfile.restore was found invalid and was overwritten. Error:\n #{restore_file_error}".red
         end        
@@ -263,22 +261,6 @@ module PodBuilder
         return buildable_subspecs - pods_to_build
       end
 
-      def self.sanity_checks
-        lines = File.read(PodBuilder::project_path("Podfile")).split("\n")
-        stripped_lines = lines.map { |x| Podfile.strip_line(x) }.select { |x| !x.start_with?("#")}
-
-        expected_stripped = Podfile::PRE_INSTALL_ACTIONS.map { |x| Podfile.strip_line(x) }
-
-        if !expected_stripped.all? { |x| stripped_lines.include?(x) }
-          warn_message = "PodBuilder's pre install actions missing from application Podfile!\n"
-          if OPTIONS[:allow_warnings]
-            puts "\n\n#{warn_message}".yellow
-          else
-            raise "\n\n#{warn_message}\n".red
-          end
-        end
-      end
-
       def self.resolve_pods_to_build(argument_pods, buildable_items)
         pods_to_build = []
         

data/lib/pod_builder/command/init.rb

@@ -31,6 +31,7 @@ module PodBuilder
 
         podfile_content = File.read(prebuilt_podfile_path)
         
+        podfile_content = Podfile.add_configuration_load_block(podfile_content)        
         podfile_content = Podfile.add_install_block(podfile_content)
         podfile_content = Podfile.update_path_entries(podfile_content, Init.method(:podfile_path_transform))
         podfile_content = Podfile.update_project_entries(podfile_content, Init.method(:podfile_path_transform))

data/lib/pod_builder/configuration.rb

@@ -323,13 +323,21 @@ module PodBuilder
       
       return File.join(path, Configuration.configuration_filename)
     end
-    
+
+    @@podbuilder_path_cache = nil
     def self.podbuilder_path
+      if path = @@podbuilder_path_cache
+        return path
+      end
+
       paths = Dir.glob("#{PodBuilder::home}/**/.pod_builder")
       paths.reject! { |t| t.match(/pod-builder-.*\/Example\/#{File.basename(Configuration.base_path)}\/\.pod_builder$/i) }
       raise "\n\nToo many .pod_builder found `#{paths.join("\n")}`\n".red if paths.count > 1
-      
-      return paths.count > 0 ? File.dirname(paths.first) : nil
+
+      path = paths.count > 0 ? File.dirname(paths.first) : nil
+      @@podbuilder_path_cache = path
+
+      return path
     end
   end  
 end

data/lib/pod_builder/core.rb

@@ -13,6 +13,7 @@ require 'pod_builder/configuration'
 require 'pod_builder/podspec'
 require 'pod_builder/licenses'
 require 'pod_builder/actions'
+require 'pod_builder/swizzles'
 
 require 'core_ext/string'
 

data/lib/pod_builder/install.rb

@@ -1,102 +1,7 @@
 require 'digest'
 require 'colored'
 require 'highline/import'
-
-# The following begin/end clause contains a set of monkey patches of the original CP implementation
-
-# 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::Specification
-    Pod::Specification.singleton_class.send(:alias_method, :swz_from_hash, :from_hash)
-    Pod::Specification.singleton_class.send(:alias_method, :swz_from_string, :from_string)
-    
-    def self.from_string(*args)
-      spec = swz_from_string(*args)
-      
-      if overrides = PodBuilder::Configuration.spec_overrides[spec.name]
-        overrides.each do |k, v|
-          if spec.attributes_hash[k].is_a?(Hash)
-            current = spec.attributes_hash[k]
-            spec.attributes_hash[k] = current.merge(v)
-          else
-            spec.attributes_hash[k] = v
-          end
-        end
-      end
-      
-      spec
-    end
-  end 
-  
-  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 "\n\nBuildType not found. Open an issue reporting your CocoaPods version\n".red
-        end
-      else
-        swz_build_type()
-      end
-    end
-  end
-
-  class Pod::PodTarget
-    @@modules_override = Hash.new
-
-    def self.modules_override= (x)
-      @@modules_override = x
-    end
-
-    def self.modules_override
-        return @@modules_override
-    end
-
-    alias_method :swz_defines_module?, :defines_module?
-
-    def defines_module?      
-      return @@modules_override.has_key?(name) ? @@modules_override[name] : swz_defines_module?
-    end
-  end
-  
-  # Starting from CocoaPods 1.10.0 and later resources are no longer copied inside the .framework
-  # when building static frameworks. While this is correct when using CP normally, for redistributable
-  # frameworks we require resources to be shipped along the binary
-  class Pod::Installer::Xcode::PodsProjectGenerator::PodTargetInstaller
-    alias_method :swz_add_files_to_build_phases, :add_files_to_build_phases
-    
-    def add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
-      target.mock_dynamic_framework = target.build_as_static_framework?
-      swz_add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
-      target.mock_dynamic_framework = false
-    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 LoadError
-  # CocoaPods 1.6.2 or earlier
-end
+require 'pod_builder/core'
 
 module PodBuilder
   class InstallResult

data/lib/pod_builder/podfile.rb

@@ -3,8 +3,6 @@ module PodBuilder
   class Podfile
     PODBUILDER_LOCK_ACTION = ["raise \"\\n🚨  Do not launch 'pod install' manually, use `pod_builder` instead!\\n\" if !File.exist?('pod_builder.lock')"].freeze    
     
-    PRE_INSTALL_ACTIONS = ["Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_duplicate_framework_and_library_names) {}", "require 'pod_builder/podfile/pre_actions_swizzles'"].freeze
-
     def self.from_podfile_items(items, analyzer, build_configuration, install_using_frameworks, build_catalyst, build_xcframeworks)
       raise "\n\nno items\n".red unless items.count > 0
 
@@ -254,8 +252,6 @@ module PodBuilder
       podfile_content = Podfile.update_project_entries(podfile_content, Podfile.method(:podfile_path_transform))
       podfile_content = Podfile.update_require_entries(podfile_content, Podfile.method(:podfile_path_transform))
 
-      podfile_content = add_pre_install_actions(podfile_content)
-
       project_podfile_path = PodBuilder::project_path("Podfile")
       File.write(project_podfile_path, podfile_content)
     end
@@ -273,8 +269,6 @@ module PodBuilder
       podfile_content = Podfile.update_project_entries(podfile_content, Podfile.method(:podfile_path_transform))
       podfile_content = Podfile.update_require_entries(podfile_content, Podfile.method(:podfile_path_transform))
 
-      podfile_content = add_pre_install_actions(podfile_content)
-
       project_podfile_path = PodBuilder::project_path("Podfile")
       File.write(project_podfile_path, podfile_content)
     end
@@ -375,7 +369,9 @@ module PodBuilder
         return
       end
 
-      File.read(podfile_path).each_line do |line|
+      content = File.read(podfile_path)
+
+      content.each_line do |line|
         stripped_line = strip_line(line)
         unless !stripped_line.start_with?("#")
           next
@@ -386,6 +382,10 @@ module PodBuilder
           raise "\n\nUnsupported single line def/pod. `def` and `pod` shouldn't be on the same line, please modify the following line:\n#{line}\n".red if starting_def_found
         end
       end
+
+      unless content.include?("PodBuilder::Configuration::load")
+        raise "\n\nUnsupported PodBuilder/Podfile found!\n\nStarting from version 5.x Podfile should contain the following lines:\nrequire 'pod_builder/core'\nPodBuilder::Configuration::load\n\nPlease manually add them to the top of your Podfile\n".red
+      end
     end
 
     def self.resolve_pod_names(names, all_buildable_items)
@@ -511,8 +511,12 @@ module PodBuilder
       return add(PODBUILDER_LOCK_ACTION, "pre_install", podfile_content)
     end
 
-    def self.add_pre_install_actions(podfile_content)
-      return add(PRE_INSTALL_ACTIONS + [" "], "pre_install", podfile_content)
+    def self.add_configuration_load_block(podfile_content)
+      unless podfile_content.include?("require 'pod_builder/core")
+        podfile_content = "require 'pod_builder/core'\nPodBuilder::Configuration::load\n\n" + podfile_content
+      end
+
+      return podfile_content
     end
 
     def self.add(entries, marker, podfile_content)

data/lib/pod_builder/swizzles.rb

@@ -0,0 +1,186 @@
+require 'xcodeproj'
+require 'pod_builder/core'
+require 'digest'
+
+# Skip warning
+Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_duplicate_framework_and_library_names) {}
+
+# workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
+Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
+
+# The following begin/end clause contains a set of monkey patches of the original CP implementation
+
+# 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::Specification
+    Pod::Specification.singleton_class.send(:alias_method, :swz_from_hash, :from_hash)
+    Pod::Specification.singleton_class.send(:alias_method, :swz_from_string, :from_string)
+    
+    def self.from_string(*args)
+      spec = swz_from_string(*args)
+      
+      if overrides = PodBuilder::Configuration.spec_overrides[spec.name]
+        overrides.each do |k, v|
+          if spec.attributes_hash[k].is_a?(Hash)
+            current = spec.attributes_hash[k]
+            spec.attributes_hash[k] = current.merge(v)
+          else
+            spec.attributes_hash[k] = v
+          end
+        end
+      end
+      
+      spec
+    end
+  end 
+  
+  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 "\n\nBuildType not found. Open an issue reporting your CocoaPods version\n".red
+        end
+      else
+        swz_build_type()
+      end
+    end
+  end
+
+  class Pod::PodTarget
+    @@modules_override = Hash.new
+
+    def self.modules_override= (x)
+      @@modules_override = x
+    end
+
+    def self.modules_override
+        return @@modules_override
+    end
+
+    alias_method :swz_defines_module?, :defines_module?
+
+    def defines_module?      
+      return @@modules_override.has_key?(name) ? @@modules_override[name] : swz_defines_module?
+    end
+  end
+  
+  # Starting from CocoaPods 1.10.0 and later resources are no longer copied inside the .framework
+  # when building static frameworks. While this is correct when using CP normally, for redistributable
+  # frameworks we require resources to be shipped along the binary
+  class Pod::Installer::Xcode::PodsProjectGenerator::PodTargetInstaller
+    alias_method :swz_add_files_to_build_phases, :add_files_to_build_phases
+    
+    def add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
+      target.mock_dynamic_framework = target.build_as_static_framework?
+      swz_add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
+      target.mock_dynamic_framework = false
+    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 LoadError
+  # CocoaPods 1.6.2 or earlier
+end
+
+class Pod::Generator::FileList
+  alias_method :swz_initialize, :initialize
+  
+  def initialize(paths)
+    paths.uniq!
+    swz_initialize(paths)
+  end
+end 
+
+class Pod::Generator::CopyXCFrameworksScript
+  alias_method :swz_initialize, :initialize
+  
+  def initialize(xcframeworks, sandbox_root, platform)
+    xcframeworks.uniq! { |t| t.path }
+    swz_initialize(xcframeworks, sandbox_root, platform)
+  end
+end 
+
+class Pod::Generator::EmbedFrameworksScript
+  alias_method :swz_initialize, :initialize
+  
+  def initialize(*args)
+    raise "\n\nUnsupported CocoaPods version\n".red if (args.count == 0 || args.count > 2)
+    
+    frameworks_by_config = args[0]
+    frameworks_by_config.keys.each do |key|
+      items = frameworks_by_config[key]
+      items.uniq! { |t| t.source_path }
+      frameworks_by_config[key] = items
+    end
+
+    if args.count == 2
+      # CocoaPods 1.10.0 and newer
+      xcframeworks_by_config = args[1]
+      xcframeworks_by_config.keys.each do |key|
+        items = xcframeworks_by_config[key]
+        items.uniq! { |t| t.path }
+        xcframeworks_by_config[key] = items
+      end
+    end
+
+    swz_initialize(*args)
+  end
+end 
+
+class Pod::Generator::CopyResourcesScript
+  alias_method :swz_initialize, :initialize
+  
+  def initialize(resources_by_config, platform)
+    resources_by_config.keys.each do |key|
+      items = resources_by_config[key]
+      items.uniq!
+
+      colliding_resources = items.group_by { |t| File.basename(t) }.values.select { |t| t.count > 1 }
+
+      unless colliding_resources.empty?
+        message = ""
+        colliding_resources.each do |resources|
+          resources.map! { |t| File.expand_path(t.gsub("${PODS_ROOT}", "#{Dir.pwd}/Pods")) }
+          # check that files are identical. 
+          # For files with paths that are resolved (e.g containing ${PODS_ROOT}) we use the file hash
+          # we fallback to the filename for the others
+          hashes = resources.map { |t| File.exists?(t) ? Digest::MD5.hexdigest(File.read(t)) : File.basename(t) }
+          if hashes.uniq.count > 1
+            message += resources.join("\n") + "\n"
+          end
+        end
+
+        unless message.empty?
+          message = "\n\nThe following resources have the same name and will collide once copied into application bundle:\n" + message
+          raise message
+        end
+      end
+
+      resources_by_config[key] = items
+    end
+    
+    swz_initialize(resources_by_config, platform)
+  end
+end 

data/lib/pod_builder/templates/build_podfile.template

@@ -1,4 +1,7 @@
 require 'cfpropertylist'
+require 'pod_builder/core'
+
+PodBuilder::Configuration::load
 
 %%%sources%%%
 
@@ -63,10 +66,6 @@ pre_install do |installer|
     # set a random version to please CocoaPods, the proper version will be overridden by set_build_settings()
     target.root_spec.swift_version = "1.0" 
   end
-
-  # workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
-  Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
-  Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_duplicate_framework_and_library_names) {}
 end
 
 post_install do |installer|

data/lib/pod_builder/version.rb

@@ -1,3 +1,3 @@
 module PodBuilder
-  VERSION = "4.4.5"
+  VERSION = "5.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 4.4.5
+  version: 5.0.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,12 +206,12 @@ files:
 - lib/pod_builder/install.rb
 - lib/pod_builder/licenses.rb
 - lib/pod_builder/podfile.rb
-- lib/pod_builder/podfile/pre_actions_swizzles.rb
 - lib/pod_builder/podfile_cp.rb
 - lib/pod_builder/podfile_item.rb
 - lib/pod_builder/podspec.rb
 - lib/pod_builder/rome/post_install.rb
 - lib/pod_builder/rome/pre_install.rb
+- lib/pod_builder/swizzles.rb
 - lib/pod_builder/templates/build_podfile.template
 - lib/pod_builder/templates/build_podspec.template
 - lib/pod_builder/version.rb

data/lib/pod_builder/podfile/pre_actions_swizzles.rb

@@ -1,84 +0,0 @@
-require 'xcodeproj'
-require 'pod_builder/core'
-require 'digest'
-
-class Pod::Generator::FileList
-  alias_method :swz_initialize, :initialize
-  
-  def initialize(paths)
-    paths.uniq!
-    swz_initialize(paths)
-  end
-end 
-
-class Pod::Generator::CopyXCFrameworksScript
-  alias_method :swz_initialize, :initialize
-  
-  def initialize(xcframeworks, sandbox_root, platform)
-    xcframeworks.uniq! { |t| t.path }
-    swz_initialize(xcframeworks, sandbox_root, platform)
-  end
-end 
-
-class Pod::Generator::EmbedFrameworksScript
-  alias_method :swz_initialize, :initialize
-  
-  def initialize(*args)
-    raise "\n\nUnsupported CocoaPods version\n".red if (args.count == 0 || args.count > 2)
-    
-    frameworks_by_config = args[0]
-    frameworks_by_config.keys.each do |key|
-      items = frameworks_by_config[key]
-      items.uniq! { |t| t.source_path }
-      frameworks_by_config[key] = items
-    end
-
-    if args.count == 2
-      # CocoaPods 1.10.0 and newer
-      xcframeworks_by_config = args[1]
-      xcframeworks_by_config.keys.each do |key|
-        items = xcframeworks_by_config[key]
-        items.uniq! { |t| t.path }
-        xcframeworks_by_config[key] = items
-      end
-    end
-
-    swz_initialize(*args)
-  end
-end 
-
-class Pod::Generator::CopyResourcesScript
-  alias_method :swz_initialize, :initialize
-  
-  def initialize(resources_by_config, platform)
-    resources_by_config.keys.each do |key|
-      items = resources_by_config[key]
-      items.uniq!
-
-      colliding_resources = items.group_by { |t| File.basename(t) }.values.select { |t| t.count > 1 }
-
-      unless colliding_resources.empty?
-        message = ""
-        colliding_resources.each do |resources|
-          resources.map! { |t| File.expand_path(t.gsub("${PODS_ROOT}", "#{Dir.pwd}/Pods")) }
-          # check that files are identical. 
-          # For files with paths that are resolved (e.g containing ${PODS_ROOT}) we use the file hash
-          # we fallback to the filename for the others
-          hashes = resources.map { |t| File.exists?(t) ? Digest::MD5.hexdigest(File.read(t)) : File.basename(t) }
-          if hashes.uniq.count > 1
-            message += resources.join("\n") + "\n"
-          end
-        end
-
-        unless message.empty?
-          message = "\n\nThe following resources have the same name and will collide once copied into application bundle:\n" + message
-          raise message
-        end
-      end
-
-      resources_by_config[key] = items
-    end
-    
-    swz_initialize(resources_by_config, platform)
-  end
-end