pod-builder 1.9.4 → 2.0.0.beta.18

data/lib/pod_builder/install.rb

@@ -1,41 +1,6 @@
 require 'cfpropertylist'
-
-# 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
-
-  def analyze(*args)
-    spec = consumer.spec
-    if overrides = PodBuilder::Configuration.spec_overrides[spec.name]
-      overrides.each do |k, v|
-        spec.attributes_hash[k] = v
-      end
-    end
-
-    return swz_analyze
-  end
-end
-
-Pod::Downloader.singleton_class.send(:alias_method, :swz_download, :download)
-module Pod::Downloader
-  def self.download(
-    request,
-    target,
-    can_cache: true,
-    cache_path: Pod::Config.instance.cache_root + 'Pods'
-  )
-    result = swz_download(request, target)
-
-    if overrides = PodBuilder::Configuration.spec_overrides[result.spec.name]
-      overrides.each do |k, v|
-        result.spec.attributes_hash[k] = v
-      end
-    end
-    
-    result
-  end
-end
+require 'digest'
+require 'colored'
 
 # The Pod::Target and Pod::Installer::Xcode::PodTargetDependencyInstaller swizzles patch
 # the following issues: 
@@ -44,6 +9,23 @@ end
 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|
+          spec.attributes_hash[k] = v
+        end
+      end
+
+      spec
+    end
+  end 
+
   class Pod::Target
     attr_accessor :mock_dynamic_framework
 
@@ -64,6 +46,19 @@ begin
     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
   
@@ -81,6 +76,8 @@ end
 module PodBuilder
   class Install
     def self.podfile(podfile_content, podfile_items, build_configuration)
+      puts "Preparing build Podfile".yellow
+
       PodBuilder::safe_rm_rf(Configuration.build_path)
       FileUtils.mkdir_p(Configuration.build_path)
 
@@ -96,7 +93,7 @@ module PodBuilder
         end
 
         # It is important that CocoaPods compiles the files under Configuration.build_path in order that DWARF
-        # debug info reference to this path. Doing otherwise breaks the assumptions that make the `update_lldbinit`
+        # debug info reference to this path. Doing otherwise breaks the assumptions that makes the `update_lldbinit`
         # command work
         podfile_content.gsub!("'#{podfile_item.path}'", "'#{destination_path}'")
         
@@ -113,39 +110,89 @@ module PodBuilder
       begin  
         lock_file = "#{Configuration.build_path}/pod_builder.lock"
         FileUtils.touch(lock_file)
+
+        framework_build_hashes = Hash.new
+        if !OPTIONS.has_key?(:force_rebuild)
+          download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
+
+          # Replace prebuilt entries in Podfile for Pods that have no changes in source code which will avoid rebuilding them
+          items = podfile_items.group_by { |t| t.root_name }.map { |k, v| v.first } # Return one podfile_item per root_name
+          items.each do |item|
+            framework_path = File.join(PodBuilder::prebuiltpath, "#{item.module_name}.framework")
+            podspec_path = File.join(PodBuilder::prebuiltpath, "#{item.root_name}.podspec")
+            if (last_build_folder_hash = build_folder_hash_in_framework_plist_info(framework_path)) && File.exist?(podspec_path)
+              if last_build_folder_hash == build_folder_hash(item)
+                puts "No changes detected to '#{item.root_name}', will skip rebuild".blue
+                podfile_items.select { |t| t.root_name == item.root_name }.each do |replace_item|
+                  replace_regex = "pod '#{Regexp.quote(replace_item.name)}', .*"
+                  replace_line_found = podfile_content =~ /#{replace_regex}/i
+                  raise "Failed finding pod entry for '#{replace_item.name}'" unless replace_line_found
+                  podfile_content.gsub!(/#{replace_regex}/, replace_item.prebuilt_entry(true, true))
+                end
+              end
+            end
+          end
+
+          File.write(podfile_path, podfile_content)          
+        end  
   
         install
 
         add_framework_plist_info(podfile_items)
-        cleanup_frameworks(podfile_items)
+        cleanup_frameworks(podfile_items)        
         copy_frameworks(podfile_items)
         copy_libraries(podfile_items)
-        if build_configuration != "debug"
-          copy_dsyms(podfile_items)
-        end
+        copy_dsyms(podfile_items)
       rescue Exception => e
         raise e
       ensure
         FileUtils.rm(lock_file)
+
+        if !OPTIONS.has_key?(:debug)
+          PodBuilder::safe_rm_rf(Configuration.build_path)
+        end  
       end
     end
 
     private 
 
     def self.install
+      puts "Building frameworks".yellow
+
       CLAide::Command::PluginManager.load_plugins("cocoapods")
 
-      current_dir = Dir.pwd
-      
-      Dir.chdir(Configuration.build_path)
+      Dir.chdir(Configuration.build_path) do
+        config = Pod::Config.new()
+        installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
+        installer.repo_update = false
+        installer.update = false
+        
+        install_start_time = Time.now
+        installer.install! 
+        install_time = Time.now - install_start_time
 
-      config = Pod::Config.new()
-      installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
-      installer.repo_update = false
-      installer.update = false
-      installer.install!  
+        puts "Build completed in #{install_time.to_i} seconds".blue
+      end
+    end
 
-      Dir.chdir(current_dir)
+    def self.download
+      puts "Downloading Pods source code".yellow
+
+      CLAide::Command::PluginManager.load_plugins("cocoapods")
+
+      Dir.chdir(Configuration.build_path) do
+        Pod::UserInterface::config.silent = true
+
+        config = Pod::Config.new()
+        installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
+        installer.repo_update = false
+        installer.update = false
+        installer.prepare
+        installer.resolve_dependencies
+        installer.download_dependencies
+
+        Pod::UserInterface::config.silent = false
+      end
     end
 
     def self.rel_path(path, podfile_items)
@@ -160,12 +207,12 @@ module PodBuilder
 
     def self.add_framework_plist_info(podfile_items)
       swift_version = PodBuilder::system_swift_version
-      Dir.glob("#{Configuration.build_path}/Rome/*.framework") do |framework_path|
+      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.framework")) do |framework_path|
         filename_ext = File.basename(framework_path)
         filename = File.basename(framework_path, ".*")
 
         specs = podfile_items.select { |x| x.module_name == filename }
-        specs += podfile_items.select { |x| x.vendored_items.map { |x| File.basename(x) }.include?(filename_ext) }
+        specs += podfile_items.select { |x| x.vendored_frameworks.map { |x| File.basename(x) }.include?(filename_ext) }
         if podfile_item = specs.first
           podbuilder_file = File.join(framework_path, Configuration.framework_plist_filename)
           entry = podfile_item.entry(true, false)
@@ -182,6 +229,7 @@ module PodBuilder
           plist_data['specs'] = (specs.map(&:name) + subspec_self_deps).uniq
           plist_data['is_static'] = podfile_item.is_static
           plist_data['original_compile_path'] = Pathname.new(Configuration.build_path).realpath.to_s
+          plist_data['build_folder_hash'] = build_folder_hash(podfile_item)
 
           plist.value = CFPropertyList.guess(plist_data)
           plist.save(podbuilder_file, CFPropertyList::List::FORMAT_BINARY)
@@ -192,28 +240,29 @@ module PodBuilder
     end
 
     def self.cleanup_frameworks(podfile_items)
-      Dir.glob("#{Configuration.build_path}/Rome/*.framework") do |framework_path|
+      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.framework")) do |framework_path|
         framework_rel_path = rel_path(framework_path, podfile_items)
         dsym_path = framework_rel_path + ".dSYM"
 
-        PodBuilder::safe_rm_rf(PodBuilder::basepath("Rome/#{framework_rel_path}"))
-        PodBuilder::safe_rm_rf(PodBuilder::basepath("dSYM/iphoneos/#{dsym_path}"))
-        PodBuilder::safe_rm_rf(PodBuilder::basepath("dSYM/iphonesimulator/#{dsym_path}"))
+        PodBuilder::safe_rm_rf(PodBuilder::prebuiltpath(framework_rel_path))
+        Configuration.supported_platforms.each do |platform|
+          PodBuilder::safe_rm_rf(PodBuilder::dsympath("#{platform}/#{dsym_path}"))
+        end
       end
     end
 
     def self.copy_frameworks(podfile_items)
-      Dir.glob("#{Configuration.build_path}/Rome/*.framework") do |framework_path|
+      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.framework")) do |framework_path|
         framework_rel_path = rel_path(framework_path, podfile_items)
 
-        destination_path = PodBuilder::basepath("Rome/#{framework_rel_path}")
+        destination_path = PodBuilder::prebuiltpath(framework_rel_path)
         FileUtils.mkdir_p(File.dirname(destination_path))
         FileUtils.cp_r(framework_path, destination_path)
       end
     end
 
     def self.copy_libraries(podfile_items)
-      Dir.glob("#{Configuration.build_path}/Rome/*.a") do |library_path|
+      Dir.glob(PodBuilder::buildpath_prebuiltpath("*.a")) do |library_path|
         library_name = File.basename(library_path)
 
         # Find vendored libraries in the build folder:
@@ -226,11 +275,7 @@ module PodBuilder
             next
           end
           
-          podfile_item.vendored_items.each do |vendored_item|
-            unless vendored_item.end_with?(".a")
-              next
-            end
-            
+          podfile_item.vendored_libraries.each do |vendored_item|
             if result = Dir.glob("#{search_base}**/#{vendored_item}").first
               result_path = result.gsub(search_base, "")
               module_name = result_path.split("/").first
@@ -239,7 +284,7 @@ module PodBuilder
                                 
                 result_path = result_path.split("/").drop(1).join("/")
 
-                destination_path = PodBuilder::basepath("Rome/#{library_rel_path}/#{result_path}")
+                destination_path = PodBuilder::prebuiltpath("#{library_rel_path}/#{result_path}")
                 FileUtils.mkdir_p(File.dirname(destination_path))
                 FileUtils.cp_r(library_path, destination_path, :remove_destination => true)
               end
@@ -247,7 +292,7 @@ module PodBuilder
           end
 
           # A pod might depend upon a static library that is shipped with a prebuilt framework
-          # which is not added to the Rome folder and the PodBuilder.podspec
+          # which is not added to the Rome folder and podspecs
           # 
           # An example is Google-Mobile-Ads-SDK which adds
           # - vendored framework: GooleMobileAds.framework 
@@ -261,7 +306,7 @@ module PodBuilder
                                 
               result_path = result_path.split("/").drop(1).join("/")
 
-              destination_path = PodBuilder::basepath("Rome/#{library_rel_path}/#{result_path}")
+              destination_path = PodBuilder::prebuiltpath("#{library_rel_path}/#{result_path}")
               FileUtils.mkdir_p(File.dirname(destination_path))
               FileUtils.cp_r(library_path, destination_path)        
             end
@@ -271,20 +316,14 @@ module PodBuilder
     end
 
     def self.copy_dsyms(podfile_items)
-      Dir.glob("#{Configuration.build_path}/dSYM/*iphoneos/**/*.dSYM") do |dsym_path|
-        framework_rel_path = rel_path(dsym_path.gsub(File.extname(dsym_path), ""), podfile_items)
-        
-        destination_path = PodBuilder::basepath("dSYM/iphoneos/#{File.dirname(framework_rel_path)}") 
-        FileUtils.mkdir_p(destination_path)
-        FileUtils.cp_r(dsym_path, destination_path)
-      end
-
-      Dir.glob("#{Configuration.build_path}/dSYM/*iphonesimulator/**/*.dSYM") do |dsym_path|
-        framework_rel_path = rel_path(dsym_path.gsub(File.extname(dsym_path), ""), podfile_items)
-
-        destination_path = PodBuilder::basepath("dSYM/iphonesimulator/#{File.dirname(framework_rel_path)}") 
-        FileUtils.mkdir_p(destination_path)
-        FileUtils.cp_r(dsym_path, destination_path)
+      Configuration.supported_platforms.each do |platform|
+        Dir.glob("#{Configuration.build_path}/dSYM/#{platform}/**/*.dSYM") do |dsym_path|
+          framework_rel_path = rel_path(dsym_path.gsub(File.extname(dsym_path), ""), podfile_items)
+          
+          destination_path = PodBuilder::dsympath("#{platform}/#{File.dirname(framework_rel_path)}") 
+          FileUtils.mkdir_p(destination_path)
+          FileUtils.cp_r(dsym_path, destination_path)
+        end  
       end
     end
 
@@ -295,5 +334,32 @@ module PodBuilder
       system("git init")
       Dir.chdir(current_dir)
     end
+
+    def self.build_folder_hash_in_framework_plist_info(framework_path)
+      podbuilder_file = File.join(framework_path, Configuration.framework_plist_filename)
+
+      unless File.exist?(podbuilder_file)
+        return nil
+      end
+
+      plist = CFPropertyList::List.new(:file => podbuilder_file)
+      data = CFPropertyList.native_types(plist.value)
+
+      return data['build_folder_hash']
+    end
+
+    def self.build_folder_hash(podfile_item)
+      if podfile_item.is_development_pod
+        if Pathname.new(podfile_item.path).absolute?
+          item_path = podfile_item.path
+        else 
+          item_path = PodBuilder::basepath(podfile_item.path)
+        end
+      else
+        item_path = "#{Configuration.build_path}/Pods/#{podfile_item.root_name}"
+      end
+
+      return `find '#{item_path}' -type f -print0 | sort -z | xargs -0 sha1sum | sha1sum | cut -d' ' -f1`.strip()
+    end
   end
 end

data/lib/pod_builder/podfile/post_actions.rb

@@ -1,4 +1,3 @@
-require 'colored'
 require 'xcodeproj'
 require 'pod_builder/core'
 

data/lib/pod_builder/podfile.rb

@@ -6,7 +6,7 @@ module PodBuilder
     PRE_INSTALL_ACTIONS = ["Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_duplicate_framework_and_library_names) {}"].freeze
     private_constant :PRE_INSTALL_ACTIONS
 
-    def self.from_podfile_items(items, analyzer)
+    def self.from_podfile_items(items, analyzer, build_configuration)
       raise "no items" unless items.count > 0
 
       sources = analyzer.sources
@@ -20,9 +20,7 @@ module PodBuilder
 
       podfile.sub!("%%%sources%%%", sources.map { |x| "source '#{x.url}'" }.join("\n"))
 
-      build_configurations = items.map(&:build_configuration).uniq
-      raise "Found different build configurations in #{items}" if build_configurations.count != 1
-      podfile.sub!("%%%build_configuration%%%", build_configurations.first.capitalize)
+      podfile.sub!("%%%build_configuration%%%", build_configuration.capitalize)
 
       podfile_build_settings = ""
       
@@ -35,12 +33,25 @@ module PodBuilder
         
         # These settings need to be set as is to properly build frameworks
         build_settings['SWIFT_COMPILATION_MODE'] = 'wholemodule'
-        build_settings['CLANG_ENABLE_MODULE_DEBUGGING'] = 'NO'
         build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
         build_settings['DEBUG_INFORMATION_FORMAT'] = "dwarf-with-dsym"
 
+        build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = platform.deployment_target.version # Fix compilation warnings on Xcode 12
+
+        # Don't store .pcm info in binary, see https://forums.swift.org/t/swift-behavior-of-gmodules-and-dsyms/23211/3
+        build_settings['CLANG_ENABLE_MODULE_DEBUGGING'] = 'NO'
+        build_settings['OTHER_SWIFT_FLAGS'] = "-Xfrontend -no-clang-module-breadcrumbs"
+
+        # Improve compile speed
+        build_settings['COMPILER_INDEX_STORE_ENABLE'] = 'NO'
+        build_settings['SWIFT_INDEX_STORE_ENABLE'] = 'NO'
+        build_settings['MTL_ENABLE_INDEX_STORE'] = 'NO'
+
         if Configuration.build_system == "Legacy"
           build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = "NO"
+          raise "\n\nCan't enable library evolution support with legacy build system!" if Configuration.library_evolution_support
+        elsif Configuration.library_evolution_support
+          build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = "YES"
         end
 
         build_settings['SWIFT_VERSION'] = item_build_settings["SWIFT_VERSION"] || item.swift_version || project_swift_version(analyzer)
@@ -55,7 +66,7 @@ module PodBuilder
           if x.split("/").first == item.root_name
             next nil # remove dependency to parent spec
           end
-          if overridded_module_name = Configuration.spec_overrides.fetch(x, {})["module_name"]
+          if overridded_module_name = Configuration.spec_overrides.fetch(x, {})["module_name"] # this might no longer be needed after
             next overridded_module_name
           end
         }.compact
@@ -104,9 +115,6 @@ module PodBuilder
         }
       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"]
       podfile_content += analyzer.podfile.sources.map { |x| "source '#{x}'" }
@@ -132,7 +140,7 @@ module PodBuilder
 
         specifications.each do |spec|
           item = podfile_items.detect { |x| x.name == spec.name }
-          if buildable_items.map(&:name).include?(spec.name)
+          if podfile_items.map(&:name).include?(spec.name)
             podfile_content.push("\t#{item.entry}")
           end
         end
@@ -146,6 +154,9 @@ module PodBuilder
     def self.write_prebuilt(all_buildable_items, analyzer)  
       puts "Updating Application Podfile".yellow
 
+      explicit_deps = analyzer.explicit_pods()
+      explicit_deps.map! { |t| all_buildable_items.detect { |x| x.name == t.name } }
+      explicit_deps.uniq!
       podbuilder_podfile_path = PodBuilder::basepath("Podfile")
       rel_path = Pathname.new(podbuilder_podfile_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
         
@@ -162,18 +173,41 @@ module PodBuilder
 
         if pod_name = pod_definition_in(line, true)
           if podfile_item = all_buildable_items.detect { |x| x.name == pod_name }
-            if Podspec.include?(podfile_item.name)
+            if Podspec.include?(podfile_item.root_name)
               if podfile_item.vendored_framework_path.nil?
                 marker = podfile_item.prebuilt_marker()
 
                 podfile_item_dependency_items = all_buildable_items.select { |x| podfile_item.dependency_names.include?(x.name) && x.vendored_framework_path.nil? == false }
                 if podfile_item_dependency_items.count > 0
-                  prebuilt_lines += podfile_item_dependency_items.map { |x| "#{line.detect_indentation}#{x.prebuilt_entry(include_pb_entry = false)}#{marker}\n" }.uniq
+                  prebuilt_lines += podfile_item_dependency_items.map { |x| "#{line.detect_indentation}#{x.prebuilt_entry(false)}#{marker}\n" }.uniq
                 else
                   prebuilt_lines.push(line)
                 end
               else 
                 prebuilt_lines.push("#{line.detect_indentation}#{podfile_item.prebuilt_entry}\n")
+
+                marker = podfile_item.prebuilt_marker()
+                non_explicit_dependencies = podfile_item.recursive_dependencies(all_buildable_items) - explicit_deps
+                non_explicit_dependencies_root_names = non_explicit_dependencies.map(&:root_name).uniq.filter { |t| t != podfile_item.root_name }
+                non_explicit_dependencies = non_explicit_dependencies_root_names.map { |x| 
+                  if item = all_buildable_items.detect { |t| x == t.name }
+                    item                    
+                  else
+                    item = all_buildable_items.detect { |t| x == t.root_name }
+                  end
+                }.compact
+               
+                non_explicit_dependencies.each do |dep|
+                  dep_item = all_buildable_items.detect { |x| x.name == dep.name }
+
+                  if Podspec.include?(dep_item.root_name)
+                    pod_name = dep_item.prebuilt_entry(false)
+                    pod_name.gsub!(dep.name, dep.root_name)
+                    prebuilt_lines.push("#{line.detect_indentation}#{pod_name}#{marker}\n")
+                  end
+
+                  explicit_deps.push(dep)
+                end
               end
 
               next
@@ -197,7 +231,8 @@ module PodBuilder
       puts "Running pod install".yellow
 
       Dir.chdir(PodBuilder::project_path) do
-        system("pod install;")
+        bundler_prefix = Configuration.use_bundler ? "bundle exec " : ""
+        system("#{bundler_prefix}pod install;")
       end
     end
 
@@ -253,6 +288,8 @@ module PodBuilder
         return nil
       end
 
+      puts "Checking Podfile.restore".yellow
+
       podfile_restore_path = PodBuilder::basepath("Podfile.restore")
       unless File.exist?(podfile_restore_path)
         return
@@ -298,6 +335,38 @@ module PodBuilder
       end
     end
 
+    def self.resolve_pod_names(names, all_buildable_items)
+      resolved_names = []
+
+      names.each do |name|
+        if item = all_buildable_items.detect { |t| t.root_name.downcase == name.downcase }
+          resolved_names.push(item.root_name)
+        end
+      end
+
+      return resolved_names.uniq
+    end
+
+    def self.resolve_pod_names_from_podfile(names)
+      resolved_names = []
+
+      # resolve potentially wrong pod name case
+      podfile_path = PodBuilder::basepath("Podfile")
+      content = File.read(podfile_path)
+        
+      current_section = ""
+      content.each_line do |line|
+        matches = line.gsub("\"", "'").match(/pod '(.*?)'/)
+        if matches&.size == 2
+          if resolved_name = names.detect { |t| matches[1].split("/").first.downcase == t.downcase }
+            resolved_names.push(matches[1].split("/").first)
+          end
+        end
+      end
+
+      resolved_names.uniq
+    end
+
     private
 
     def self.indentation_from_file(path)
@@ -410,7 +479,7 @@ module PodBuilder
           path = matches[6]
 
           is_absolute = ["~", "/"].include?(path[0])
-          unless !pod_name.start_with?("PodBuilder/") && !is_absolute
+          unless !PodBuilder::prebuiltpath.end_with?(path) && !is_absolute
             podfile_lines.push(line)
             next
           end