pod-builder 1.9.2 → 2.0.0.beta.19

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,10 +33,27 @@ 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)
 
         item_build_settings.each do |k, v|
@@ -51,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
@@ -100,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}'" }
@@ -128,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
@@ -142,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
         
@@ -158,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
@@ -193,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
 
@@ -249,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
@@ -294,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)
@@ -406,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

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_item.rb

@@ -1,5 +1,3 @@
-require 'pod_builder/cocoapods/specification'
-
 module PodBuilder
   class PodfileItem
     # @return [String] The git repo
@@ -10,6 +8,10 @@ module PodBuilder
     #
     attr_reader :branch
 
+    # @return [String] A checksum for the spec
+    #
+    attr_reader :checksum
+
     # @return [String] Matches @name unless for subspecs were it stores the name of the root pod
     #
     attr_reader :root_name
@@ -49,6 +51,10 @@ module PodBuilder
     # @return [Array<String>] The pod's dependency names, if any. Use dependencies() to get the [Array<PodfileItem>]
     #
     attr_reader :dependency_names
+
+    # @return [Array<String>] The pod's external dependency names (excluding subspecs), if any
+    #
+    attr_reader :external_dependency_names
     
     # @return [Bool] True if the pod is shipped as a static framework
     #
@@ -66,9 +72,13 @@ module PodBuilder
     #
     attr_accessor :build_configuration
 
-    # @return [String] The pod's vendored items (frameworks and libraries)
+    # @return [String] The pod's vendored frameworks
     #
-    attr_accessor :vendored_items
+    attr_accessor :vendored_frameworks
+
+    # @return [String] The pod's vendored libraries
+    #
+    attr_accessor :vendored_libraries
 
     # @return [String] Framweworks the pod needs to link to
     #
@@ -86,25 +96,42 @@ module PodBuilder
     #
     attr_accessor :source_files
 
+    # @return [String] license
+    #
+    attr_accessor :license
+
+    # @return [String] summary
+    #
+    attr_accessor :summary
+
+    # @return [Hash] source
+    #
+    attr_accessor :source
+
+    # @return [Hash] authors
+    #
+    attr_accessor :authors
+
+    # @return [String] homepage
+    #
+    attr_accessor :homepage
+
+    # @return [Array<String>] Default subspecs
+    #
+    attr_accessor :default_subspecs
+    
     # Initialize a new instance
     #
     # @param [Specification] spec
     #
     # @param [Hash] checkout_options
     #
-    def initialize(spec, all_specs, checkout_options)
-      if overrides = Configuration.spec_overrides[spec.name]
-        overrides.each do |k, v|
-          spec.root.attributes_hash[k] = v
-          if checkout_options.has_key?(spec.name)
-            checkout_options[spec.name][k] = v
-          end
-        end
-      end
-
+    def initialize(spec, all_specs, checkout_options, supported_platforms)
       @name = spec.name
       @root_name = spec.name.split("/").first
 
+      @checksum = spec.checksum
+
       checkout_options_keys = [@root_name, @name]
 
       if opts_key = checkout_options_keys.detect { |x| checkout_options.has_key?(x) }
@@ -120,22 +147,22 @@ module PodBuilder
         @commit = spec.root.source[:commit]
         @is_external = false
       end    
-
-      @vendored_items = recursive_vendored_items(spec, all_specs)
+      
+      @vendored_frameworks = extract_vendored_frameworks(spec, all_specs)
+      @vendored_libraries = extract_vendored_libraries(spec, all_specs)
 
       @frameworks = []
       @weak_frameworks = []
       @libraries = []
-      spec_and_dependencies(spec, all_specs).each do |spec|
-        @frameworks += extract_array(spec, "framework")
-        @frameworks += extract_array(spec, "frameworks")
-        
-        @weak_frameworks += extract_array(spec, "weak_framework")
-        @weak_frameworks += extract_array(spec, "weak_frameworks")  
 
-        @libraries += extract_array(spec, "library")
-        @libraries += extract_array(spec, "libraries")  
-      end
+      @frameworks += extract_array(spec, "framework")
+      @frameworks += extract_array(spec, "frameworks")
+      
+      @weak_frameworks += extract_array(spec, "weak_framework")
+      @weak_frameworks += extract_array(spec, "weak_frameworks")  
+
+      @libraries += extract_array(spec, "library")
+      @libraries += extract_array(spec, "libraries")  
 
       @version = spec.root.version.version
       @available_versions = spec.respond_to?(:spec_source) ? spec.spec_source.versions(@root_name)&.map(&:to_s) : [@version]
@@ -143,7 +170,18 @@ module PodBuilder
       @swift_version = spec.root.swift_version&.to_s
       @module_name = spec.root.module_name
 
-      @dependency_names = spec.recursive_dep_names(all_specs)
+      @default_subspecs = extract_array(spec, "default_subspecs")
+      if default_subspec = spec.attributes_hash["default_subspec"]
+        @default_subspecs.push(default_subspec)
+      end
+
+      @dependency_names = spec.attributes_hash.fetch("dependencies", {}).keys + default_subspecs.map { |t| "#{@root_name}/#{t}" } 
+      supported_platforms.each do |platform|        
+        @dependency_names += (spec.attributes_hash.dig(platform, "dependencies") || {}).keys
+      end
+      @dependency_names.uniq!
+
+      @external_dependency_names = @dependency_names.select { |t| !t.start_with?(root_name)  }
 
       @is_static = spec.root.attributes_hash["static_framework"] || false
       @xcconfig = spec.root.attributes_hash["xcconfig"] || {}
@@ -152,6 +190,13 @@ module PodBuilder
       
       @build_configuration = spec.root.attributes_hash.dig("pod_target_xcconfig", "prebuild_configuration") || "release"
       @build_configuration.downcase!
+
+      default_license = "MIT"
+      @license = spec.root.attributes_hash.fetch("license", {"type"=>"#{default_license}"})["type"] || default_license
+      @summary = spec.root.attributes_hash.fetch("summary", "A summary for #{@name}")
+      @source = spec.root.attributes_hash.fetch("source", { "git"=>"https://github.com/Subito-it/PodBuilder.git" })
+      @authors = spec.root.attributes_hash.fetch("authors", {"PodBuilder"=>"pod@podbuilder.com"})
+      @homepage = spec.root.attributes_hash.fetch("homepage", "https://github.com/Subito-it/PodBuilder")
     end
 
     def pod_specification(all_poditems, parent_spec = nil)
@@ -204,6 +249,43 @@ module PodBuilder
       return available_pods.select { |x| @dependency_names.include?(x.name) }
     end
 
+    def recursive_dependencies(available_pods)
+      names = [name]
+
+      deps = []
+      last_count = -1 
+      while deps.count != last_count do
+        last_count = deps.count
+
+        updated_names = []
+        names.each do |name|
+          if pod = available_pods.detect { |t| t.name == name }
+            deps.push(pod)
+            updated_names += pod.dependency_names
+          end
+        end
+        
+        names = updated_names.uniq
+
+        deps.uniq!  
+      end
+
+      root_names = deps.map(&:root_name).uniq
+
+      # We need to build all other common subspecs to properly build the framework
+      # Ex. 
+      # PodA depends on DepA/subspec1
+      # PodB depends on DepA/subspec2
+      #
+      # When building PodA we need to build both DepA subspecs because they might 
+      # contain different code
+      deps += available_pods.select { |t| root_names.include?(t.root_name) }
+
+      deps.uniq!
+
+      return deps
+    end
+
     # @return [Bool] True if it's a pod that doesn't provide source code (is already shipped as a prebuilt pod)
     #    
     def is_prebuilt
@@ -218,14 +300,17 @@ module PodBuilder
 
       # Podspecs aren't always properly written (source_file key is often used instead of header_files)
       # Therefore it can become tricky to understand which pods are already precompiled by boxing a .framework or .a
-      vendored_items_paths = vendored_items.map { |x| File.basename(x) }
-      embedded_as_vendored = vendored_items_paths.include?("#{@module_name}.framework")
-      embedded_as_static_lib = vendored_items_paths.any? { |x| x.match(/#{module_name}.*\\.a/) != nil }
+      embedded_as_vendored = vendored_frameworks.map { |x| File.basename(x) }.include?("#{module_name}.framework")
+      embedded_as_static_lib = vendored_libraries.map { |x| File.basename(x) }.include?("lib#{module_name}.a")
       
       only_headers = (source_files.count > 0 && @source_files.all? { |x| x.end_with?(".h") })
-      no_sources = (@source_files.count == 0 || only_headers) && @vendored_items.count > 0
+      no_sources = (@source_files.count == 0 || only_headers) && (@vendored_frameworks + @vendored_libraries).count > 0
 
-      return embedded_as_static_lib || embedded_as_vendored || only_headers || no_sources
+      if !no_sources && !only_headers
+        return false
+      else
+        return embedded_as_static_lib || embedded_as_vendored
+      end
     end
 
     # @return [Bool] True if it's a subspec
@@ -271,7 +356,7 @@ module PodBuilder
       end
 
       if include_pb_entry && !is_prebuilt
-        plists = Dir.glob(PodBuilder::basepath("Rome/**/#{module_name}.framework/#{Configuration::framework_plist_filename}"))
+        plists = Dir.glob(PodBuilder::prebuiltpath("**/#{module_name}.framework/#{Configuration::framework_plist_filename}"))
         if plists.count > 0
           plist = CFPropertyList::List.new(:file => plists.first)
           data = CFPropertyList.native_types(plist.value)
@@ -302,15 +387,18 @@ module PodBuilder
       end
     end
 
-    def prebuilt_entry(include_pb_entry = true)
-      relative_path = Pathname.new(Configuration.base_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+    def prebuilt_entry(include_pb_entry = true, absolute_path = false)
+      if absolute_path 
+        pod_path = PodBuilder::prebuiltpath
+      else
+        pod_path = Pathname.new(Configuration.base_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+        pod_path += "/Rome"
+      end
 
       if Configuration.subspecs_to_split.include?(name)
-        entry = "pod 'PodBuilder/#{podspec_name}', :path => '#{relative_path}'"
-      elsif override_name = Configuration.spec_overrides.dig(name, "module_name")
-        entry = "pod 'PodBuilder/#{override_name}', :path => '#{relative_path}'"
+        entry = "pod '#{podspec_name}', :path => '#{pod_path}'"
       else
-        entry = "pod 'PodBuilder/#{root_name}', :path => '#{relative_path}'"
+        entry = "pod '#{name}', :path => '#{pod_path}'"
       end
 
       if include_pb_entry && !is_prebuilt
@@ -337,45 +425,48 @@ module PodBuilder
     end
 
     def vendored_framework_path
-      if File.exist?(PodBuilder::basepath(vendored_subspec_framework_path))
-        return vendored_subspec_framework_path
-      elsif File.exist?(PodBuilder::basepath(vendored_spec_framework_path))
-        return vendored_spec_framework_path
+      if File.exist?(PodBuilder::prebuiltpath(vendored_subspec_framework_name))
+        return vendored_subspec_framework_name
+      elsif File.exist?(PodBuilder::prebuiltpath(vendored_spec_framework_name))
+        return vendored_spec_framework_name
       end
       
       return nil
     end
     
-    def vendored_subspec_framework_path
-      return "Rome/#{prebuilt_rel_path}"
+    def vendored_subspec_framework_name
+      return "#{prebuilt_rel_path}"
     end
     
-    def vendored_spec_framework_path
-      return "Rome/#{module_name}.framework"
-    end
-
-    def self.vendored_name_framework_path(name)
-      return "Rome/#{name}"
+    def vendored_spec_framework_name
+      return "#{module_name}.framework"
     end
 
     private
 
-    def recursive_vendored_items(spec, all_specs)
+    def extract_vendored_frameworks(spec, all_specs)
       items = []
 
       supported_platforms = spec.available_platforms.flatten.map(&:name).map(&:to_s)
+      items += [spec.attributes_hash["vendored_frameworks"]]
+      items += [spec.attributes_hash["vendored_framework"]]
 
-      spec_and_dependencies(spec, all_specs).each do |spec|
-        items += [spec.attributes_hash["vendored_frameworks"]]
-        items += [spec.attributes_hash["vendored_framework"]]
-        items += [spec.attributes_hash["vendored_libraries"]]
-        items += [spec.attributes_hash["vendored_library"]]  
+      items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_frameworks"] }
+      items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_framework"] }
 
-        items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_frameworks"] }
-        items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_framework"] }
-        items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_libraries"] }
-        items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_library"] }  
-      end
+      return items.flatten.uniq.compact
+    end
+
+    def extract_vendored_libraries(spec, all_specs)
+      items = []
+
+      supported_platforms = spec.available_platforms.flatten.map(&:name).map(&:to_s)
+
+      items += [spec.attributes_hash["vendored_libraries"]]
+      items += [spec.attributes_hash["vendored_library"]]  
+
+      items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_libraries"] }
+      items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_library"] }  
 
       return items.flatten.uniq.compact
     end
@@ -429,18 +520,5 @@ module PodBuilder
 
       return source_files + root_source_files + subspec_source_files
     end
-
-    def spec_and_dependencies(spec, all_specs)
-      specs = all_specs.select { |x| spec.dependencies.map(&:name).include?(x.name) }
-      specs += all_specs.select { |x| spec.default_subspecs.any? { |y| x.name == "#{spec.name}/#{y}" } }
-      specs += [spec, spec.root].flatten.uniq
-
-      all_remaining_specs = all_specs.reject { |x| specs.map(&:name).include?(x.name) } 
-      if all_remaining_specs.count < all_specs.count
-        specs += specs.reject { |x| x == spec }.map { |x| spec_and_dependencies(x, all_remaining_specs) }
-      end
-      
-      return specs.flatten.compact.uniq
-    end
   end
 end