pod-builder 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6e1128204135a976e3e6f670dd87d43cf860c762c953ceb0b892af38a799f6a
-  data.tar.gz: cae42cf415e9d728048ab8d4fbcdf615e53511558f955bc6128dd12fc107beb4
+  metadata.gz: f3d2e466990adefdd924214e92d94859aefc2d8b844722b87a602a53c8650a19
+  data.tar.gz: 59511ec436382352ed7ca9d51ee1b60d72770a24297a27afd947514afc8f789e
 SHA512:
-  metadata.gz: 2550ca69349e42b85a7ff16d72d568b9e8c0bd15a2cf301fc6bf0494d27eba3c78aa44be9ef0c062b0a67344dfa27c2ae03b910272a82cc546e7c5ce432f3cd8
-  data.tar.gz: 9deb1429d08fcd8960d829e7e0dd15c2f26ae2c9250f40555938e59c7e86e667c29c7a14852445dbba7071d1d1ed5b447cdaac18803da3c005fdc1c50abd8666
+  metadata.gz: '09e89f2b8fefbc51d505f7205a9298e4298332b3442597c45d13da17efe74ee9099ded49613aa432e377d303f83e1a607735c07b16b9e3dfa91b52b556b9d43f'
+  data.tar.gz: 6f6b831daa3db4d01feafdf73103098cf95f0c7ad3e058ec074ccf984b339605772fc799f45241a9fb6cac490499b86943e8f7f268ff43113f79276d9146ca88

data/README.md

@@ -216,7 +216,7 @@ As an example here we're setting `module_name` in Google's Advertising SDK:
 }
 ```
 
-### `skip_pods`
+#### `skip_pods`
 
 You may want to skip some pods to be prebuilt, you can do that as follows:
 
@@ -229,7 +229,7 @@ You may want to skip some pods to be prebuilt, you can do that as follows:
 ```
 
 
-### `force_prebuild_pods`
+#### `force_prebuild_pods`
 
 You may want to force some pods to be prebuilt, this might be the case for prebuilt ones (pods with a single vendored .framework) which are dependencies of othere pods
 
@@ -244,7 +244,9 @@ You may want to force some pods to be prebuilt, this might be the case for prebu
 
 #### `build_settings`
 
-Xcode build settings to use. You can override the default values which are:
+These settings allow you to specify the build settings to use when compiling prebuilt items. These values won't be reflected in your project once the pod has been built.
+
+You can override the default values which are:
 
 ```json
 {
@@ -362,7 +364,7 @@ Please open an issue here. You may also add the name of the pod to the [`skip_po
 
 # Git LFS
 
-We high encourage to use PodBuilder in combination with Git LFS. Tacking PodBuilder/Prebuilt/**/*.framework/* and PodBuilder/Prebuilt/**/*.a and PodBuilder/dSYM/**/* will ensure that your repo size stays under control with all the benefits of having prebuilt dependencies ready to use.
+We high encourage to use PodBuilder in combination with Git LFS. Tacking `PodBuilder/Prebuilt/**/*.framework/*` and `PodBuilder/Prebuilt/**/*.a` and `PodBuilder/dSYM/**/*` will ensure that your repo size stays under control with all the benefits of having prebuilt dependencies ready to use.
 
 
 # Try it out!

data/exe/pod_builder

@@ -76,9 +76,6 @@ Options:
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
         end
-        opts.on("-r", "--parent-deps", "Include all pods that depend on the specified <PODNAME...>") do |o|
-          OPTIONS[:resolve_parent_dependencies] = true
-        end
         opts.on("-s", "--no-stdin", "Never request interaction with sdtin (e.g. in CI environment)") do |o|
           OPTIONS[:no_stdin_available] = o
         end

data/lib/pod_builder/command/build.rb

@@ -32,8 +32,6 @@ module PodBuilder
           argument_pods = all_buildable_items.map(&:root_name).uniq
         else
           argument_pods = Podfile::resolve_pod_names(argument_pods, all_buildable_items)
-          deps = all_buildable_items.select { |t| argument_pods.include?(t.root_name) }.map(&:dependency_names).flatten.map { |t| t.split("/").first }
-          argument_pods += deps
           argument_pods.uniq!
         end
 
@@ -43,8 +41,6 @@ module PodBuilder
         }
         argument_pods = available_argument_pods.uniq
         
-        prebuilt_pods_to_install = prebuilt_items.select { |x| argument_pods.include?(x.root_name) }
-
         Podfile.restore_podfile_clean(all_buildable_items)
 
         restore_file_error = Podfile.restore_file_sanity_check
@@ -54,12 +50,25 @@ module PodBuilder
         pods_to_build = resolve_pods_to_build(argument_pods, buildable_items)
         buildable_items -= pods_to_build
 
-        # We need to split pods to build in 3 groups
+        argument_pods += pods_to_build.map(&:root_name)
+        argument_pods.uniq!
+
+        # We need to split pods to build in 4 groups
         # 1. pods to build in release
         # 2. pods to build in debug
+        # 3. pods to build in release as xcframeworks
+        # 4. pods to build in debug as xcframeworks
 
         check_not_building_development_pods(pods_to_build)
 
+        # We need to recursively add dependencies to properly split pods in groups.
+        # Example:        
+        # 1. PodA has a dep to PodB
+        # 2. PodB is marked to be built as xcframework
+        # 3. We rebuild PodA only (pods_to_build contains only PodA)
+        # 4. We need to add dependencies recursively so that PodB is is added to pods_to_build_release_xcframework
+        pods_to_build = pods_to_build.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
+
         pods_to_build_debug = pods_to_build.select { |x| x.build_configuration == "debug" }
         pods_to_build_release = pods_to_build - pods_to_build_debug
 
@@ -82,12 +91,12 @@ module PodBuilder
         install_using_frameworks = Podfile::install_using_frameworks(analyzer)
         if Configuration.react_native_project
           if install_using_frameworks
-            raise "\n\nOnly static library packaging currently supported for react native projects. Please remove 'use_frameworks!' in #{PodBuilder::basepath("Podfile")}".red 
+            raise "\n\nOnly static library packaging currently supported for react native projects. Please remove 'use_frameworks!' in #{PodBuilder::basepath("Podfile")}\n".red 
           end  
           prepare_defines_modules_override(all_buildable_items)
         else
           unless install_using_frameworks
-            raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at root level (not nested in targets) in #{PodBuilder::basepath("Podfile")}".red
+            raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at root level (not nested in targets) in #{PodBuilder::basepath("Podfile")}\n".red
           end  
         end
         
@@ -96,12 +105,17 @@ module PodBuilder
         install_result = InstallResult.new
         podfiles_items.reject { |x| x.empty? }.each do |podfile_items|
           build_configuration = podfile_items.map(&:build_configuration).uniq.first
-          
-          podfile_items = podfile_items.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
 
+          # We need to recursively find dependencies again because some of the required dependencies might have been moved to a separate group
+          # Example:
+          # 1. PodA has a dep to PodB
+          # 2. PodB is marked to be built as xcframework -> PodB will be added to pods_to_build_release_xcframework and won't be present in
+          # pods_to_build_release and therefore build will fail
+          podfile_items = podfile_items.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
+          
           podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration, install_using_frameworks, build_catalyst, podfile_items.first.build_xcframework)
           
-          install_result += Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)          
+          install_result += Install.podfile(podfile_content, podfile_items, argument_pods, podfile_items.first.build_configuration)          
           
           FileUtils.rm_f(PodBuilder::basepath("Podfile.lock"))
         end
@@ -119,6 +133,7 @@ module PodBuilder
         builded_pods_and_deps = podfiles_items.flatten.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
         builded_pods_and_deps.select! { |x| !x.is_prebuilt }
         
+        prebuilt_pods_to_install = prebuilt_items.select { |x| argument_pods.include?(x.root_name) }
         Podfile::write_restorable(builded_pods_and_deps + prebuilt_pods_to_install, all_buildable_items, analyzer)     
         if !OPTIONS.has_key?(:skip_prebuild_update)   
           Podfile::write_prebuilt(all_buildable_items, analyzer)
@@ -142,7 +157,7 @@ module PodBuilder
         build_settings = installer.analysis_result.targets.map { |t| t.user_project.root_object.targets.map { |u| u.build_configuration_list.build_configurations.map { |v| v.build_settings } } }.flatten
         build_catalyst = build_settings.detect { |t| t["SUPPORTS_MACCATALYST"] == "YES" } != nil 
         
-        puts "\nTo support Catalyst you should enable 'build_xcframeworks' in PodBuilder.json\n".red if build_catalyst && !Configuration.build_xcframeworks
+        puts "\nTo support Catalyst you should enable 'build_xcframeworks' in PodBuilder.json\n".red if build_catalyst && !Configuration.build_xcframeworks_all
 
         return build_catalyst
       end
@@ -164,11 +179,11 @@ module PodBuilder
       end
 
       def self.check_pods_exists(pods, buildable_items)
-        raise "\n\nEmpty Podfile?".red if buildable_items.nil?
+        raise "\n\nEmpty Podfile?\n".red if buildable_items.nil?
 
         buildable_items = buildable_items.map(&:root_name)
         pods.each do |pod|
-          raise "\n\nPod `#{pod}` wasn't found in Podfile.\n\nFound:\n#{buildable_items.join("\n")}\n\n".red if !buildable_items.include?(pod)
+          raise "\n\nPod `#{pod}` wasn't found in Podfile.\n\nFound:\n#{buildable_items.join("\n")}\n".red if !buildable_items.include?(pod)
         end
       end
 
@@ -182,7 +197,7 @@ module PodBuilder
           pods_with_unaligned_build_configuration = pods_with_common_deps.select { |x| x.build_configuration != pod.build_configuration }
           pods_with_unaligned_build_configuration.map!(&:name)
 
-          raise "\n\nDependencies of `#{pod.name}` don't have the same build configuration (#{pod.build_configuration}) of `#{pods_with_unaligned_build_configuration.join(",")}`'s dependencies".red if pods_with_unaligned_build_configuration.count > 0
+          raise "\n\nDependencies of `#{pod.name}` don't have the same build configuration (#{pod.build_configuration}) of `#{pods_with_unaligned_build_configuration.join(",")}`'s dependencies\n".red if pods_with_unaligned_build_configuration.count > 0
         end
       end
 
@@ -213,7 +228,7 @@ module PodBuilder
           if OPTIONS[:allow_warnings]
             puts "\n\n#{warn_message}".yellow
           else
-            raise "\n\n#{warn_message}".red
+            raise "\n\n#{warn_message}\n".red
           end
         end
       end
@@ -224,15 +239,17 @@ module PodBuilder
         pods_to_build = buildable_items.select { |x| argument_pods.include?(x.root_name) }
         pods_to_build += other_subspecs(pods_to_build, buildable_items)
 
-        if OPTIONS[:resolve_parent_dependencies]
-          dependencies = []
-          buildable_items.each do |pod|
-            if !(pod.dependencies(buildable_items) & pods_to_build).empty?
-              dependencies.push(pod)
-            end
+        # Build all pods that depend on the those that were explictly passed by the user
+        dependencies = []
+        buildable_items.each do |pod|
+          if !(pod.dependencies(buildable_items) & pods_to_build).empty?
+            dependencies.push(pod)
           end
-          pods_to_build += dependencies
         end
+        log = dependencies.reject { |t| pods_to_build.map(&:root_name).include?(t.root_name) }.map(&:root_name)
+        puts "Adding inverse dependencies: #{log.join(", ")}".blue
+
+        pods_to_build += dependencies
 
         return pods_to_build.uniq
       end      

data/lib/pod_builder/command/generate_lldbinit.rb

@@ -19,7 +19,7 @@ module PodBuilder
           end
           source_path = File.expand_path(source_path)  
           
-          raise "\n\nSpecified path does not exists" unless File.directory?(source_path)
+          raise "\n\nSpecified path does not exists\n".red unless File.directory?(source_path)
         end
         
         base_path = PodBuilder::basepath

data/lib/pod_builder/command/init.rb

@@ -122,11 +122,11 @@ module PodBuilder
         # React-Core.podspec
         file = "React-Core.podspec"
         paths = Dir.glob("#{PodBuilder::git_rootpath}/node_modules/**/#{file}")
-        raise "Unexpected number of #{file} found" if paths.count != 1
+        raise "\n\nUnexpected number of #{file} found\n".red if paths.count != 1
 
         content = File.read(paths[0])
         expected_header_search_path_prefix = "s.pod_target_xcconfig    = { \"HEADER_SEARCH_PATHS\" => \""
-        raise "Expected header search path entry not found" unless content.include?(expected_header_search_path_prefix)
+        raise "\n\nExpected header search path entry not found\n".red unless content.include?(expected_header_search_path_prefix)
 
         content.sub!(expected_header_search_path_prefix, "#{expected_header_search_path_prefix}\\\"$(PODS_ROOT)/Headers/Public/Flipper-Folly\\\" ")
         File.write(paths[0], content)        
@@ -134,11 +134,11 @@ module PodBuilder
         # React-CoreModules.podspec
         file = "React-CoreModules.podspec"
         paths = Dir.glob("#{PodBuilder::git_rootpath}/node_modules/**/#{file}")
-        raise "Unexpected number of #{file} found" if paths.count != 1
+        raise "\n\nUnexpected number of #{file} found\n".red if paths.count != 1
 
         content = File.read(paths[0])
         expected_header_search_path_prefix = "\"HEADER_SEARCH_PATHS\" => \""
-        raise "Expected header search path entry not found" unless content.include?(expected_header_search_path_prefix)
+        raise "\n\nExpected header search path entry not found\n".red unless content.include?(expected_header_search_path_prefix)
 
         content.sub!(expected_header_search_path_prefix, "#{expected_header_search_path_prefix}\\\"$(PODS_ROOT)/Headers/Public/Flipper-Folly\\\" ")
         File.write(paths[0], content)

data/lib/pod_builder/command/switch.rb

@@ -13,19 +13,23 @@ module PodBuilder
           return -1
         end
 
+        pods_not_found = []
         pod_names_to_switch = []
         argument_pods.each do |pod|
           pod_name_to_switch = pod
           pod_name_to_switch = Podfile::resolve_pod_names_from_podfile([pod_name_to_switch]).first
-          raise "\n\nDid not find pod '#{pod}'".red if pod_name_to_switch.nil?
-          
-          check_not_building_subspec(pod_name_to_switch)  
 
-          pod_names_to_switch.push(pod_name_to_switch)
+          if pod_name_to_switch.nil?
+            raise "\n\n'#{pod}' not found in PodBuilder's Podfile.\n\nYou might need to explictly add:\n\n    pod '#{pod}'\n\nto #{PodBuilder::basepath("Podfile")}\n".red
+          else
+            check_not_building_subspec(pod_name_to_switch)  
+
+            pod_names_to_switch.push(pod_name_to_switch)  
+          end          
         end
 
         if OPTIONS[:resolve_parent_dependencies] == true
-          install_update_repo = OPTIONS.fetch(:update_repos, true)
+          install_update_repo = OPTIONS.fetch(:update_repos, false)
           installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
   
           all_buildable_items = Analyze.podfile_items(installer, analyzer)
@@ -55,7 +59,7 @@ module PodBuilder
 
             podspec_content = File.read(podspec_path)
 
-            regex = "p\\d\\.dependency '(.*)'"
+            regex = "p\\d\\.dependency ['|\"](.*)['|\"]"
 
             podspec_content.each_line do |line|
               matches = line.match(/#{regex}/)
@@ -107,15 +111,15 @@ module PodBuilder
                 next
               end
     
-              matches = line.gsub("\"", "'").match(/pod '(.*?)',(.*)/)
-              if matches&.size == 3
+              matches = line.gsub("\"", "'").match(/pod '(.*?)'/)
+              if matches&.size == 2
                 if matches[1].split("/").first == pod_name_to_switch
                   default_entries[current_section] = line
                 end  
               end
             end
     
-            raise "\n\n'#{pod_name_to_switch}' not found in #{podfile_path}".red if default_entries.keys.count == 0
+            raise "\n\n'#{pod_name_to_switch}' not found in PodBuilder's Podfile.\n\nYou might need to explictly add:\n\n    pod '#{pod_name_to_switch}'\n\nto #{podfile_path}\n".red if default_entries.keys.count == 0
           end
 
           if development_path.nil? 
@@ -137,8 +141,8 @@ module PodBuilder
               current_section = line.split(" ")[1]
             end
 
-            matches = line.gsub("\"", "'").match(/pod '(.*?)',(.*)/)
-            if matches&.size == 3
+            matches = line.gsub("\"", "'").match(/pod '(.*?)'/)
+            if matches&.size == 2
               if matches[1].split("/").first == pod_name_to_switch
                 case OPTIONS[:switch_mode]
                 when "prebuilt"
@@ -166,6 +170,14 @@ module PodBuilder
                     if line.include?("# pb<") && marker = line.split("# pb<").last
                       default_line = default_line.chomp("\n") + " # pb<#{marker}"
                     end
+                    if (path_match = default_line.match(/:path => '(.*?)'/)) && path_match&.size == 2
+                      original_path = path_match[1]
+                      if !is_absolute_path(original_path)
+                        updated_path = Pathname.new(PodBuilder::basepath(original_path)).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
+                        default_line.gsub!(":path => '#{original_path}'", ":path => '#{updated_path}'")
+                      end
+                    end
+
                     lines.append(default_line)
                     next
                   elsif
@@ -190,7 +202,11 @@ module PodBuilder
         return 0
       end
       
-      private     
+      private 
+      
+      def self.is_absolute_path(path)
+        return ["~", "/"].any? { |t| path.start_with?(t) }
+      end  
 
       def self.find_podspec(podname)
         unless Configuration.development_pods_paths.count > 0
@@ -216,7 +232,7 @@ module PodBuilder
             
       def self.check_not_building_subspec(pod_to_switch)
         if pod_to_switch.include?("/")
-          raise "\n\nCan't switch subspec #{pod_to_switch} refer to podspec name.\n\nUse `pod_builder switch #{pod_to_switch.split("/").first}` instead\n\n".red
+          raise "\n\nCan't switch subspec #{pod_to_switch} refer to podspec name.\n\nUse `pod_builder switch #{pod_to_switch.split("/").first}` instead\n".red
         end
       end
     end

data/lib/pod_builder/command/update.rb

@@ -35,7 +35,6 @@ module PodBuilder
         ARGV.clear
         pods_to_update.each { |x| ARGV << x }
 
-        # OPTIONS[:resolve_parent_dependencies] = true
         return PodBuilder::Command::Build.call
       end              
     end

data/lib/pod_builder/configuration.rb

@@ -286,9 +286,9 @@ module PodBuilder
         end
       end
       if Configuration.build_xcframeworks_all
-        raise "Invalid PodBuilder.json configuration: 'build_xcframeworks_all' is true and 'build_xcframeworks_include' is not empty" if Configuration.build_xcframeworks_include.count > 0
+        raise "\n\nInvalid PodBuilder.json configuration: 'build_xcframeworks_all' is true and 'build_xcframeworks_include' is not empty\n".red if Configuration.build_xcframeworks_include.count > 0
       else
-        raise "Invalid PodBuilder.json configuration: 'build_xcframeworks_all' is false and 'build_xcframeworks_exclude' is not empty" if Configuration.build_xcframeworks_exclude.count > 0
+        raise "\n\nInvalid PodBuilder.json configuration: 'build_xcframeworks_all' is false and 'build_xcframeworks_exclude' is not empty\n".red if Configuration.build_xcframeworks_exclude.count > 0
       end
     end
     

data/lib/pod_builder/core.rb

@@ -132,7 +132,7 @@ module PodBuilder
       folder_in_home = x.gsub(home, "")
       !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(PodBuilder::basepath + "/") 
     }
-    raise "\n\nxcodeproj not found!".red if xcodeprojects.count == 0
+    raise "\n\nxcodeproj not found!\n".red if xcodeprojects.count == 0
     raise "\n\nFound multiple xcodeproj:\n#{xcodeprojects.join("\n")}".red if xcodeprojects.count > 1
 
     @@xcodeproj_path = xcodeprojects.first
@@ -148,7 +148,7 @@ module PodBuilder
       folder_in_home = x.gsub(home, "")
       !folder_in_home.include?("/Pods/") && !x.include?(PodBuilder::basepath("Sources")) && !x.include?(PodBuilder::basepath + "/") && !x.include?(".xcodeproj/")
     }
-    raise "\n\nxcworkspace not found!".red if xcworkspaces.count == 0
+    raise "\n\nxcworkspace not found!\n".red if xcworkspaces.count == 0
     raise "\n\nFound multiple xcworkspaces:\n#{xcworkspaces.join("\n")}".red if xcworkspaces.count > 1
 
     @@xcodeworkspace_path = xcworkspaces.first
@@ -179,7 +179,7 @@ module PodBuilder
 
   def self.system_swift_version
     swift_version = `swiftc --version | grep -o 'swiftlang-.*\s'`.strip()
-    raise "\n\nUnsupported swift compiler version, expecting `swiftlang` keyword in `swiftc --version`".red if swift_version.length == 0
+    raise "\n\nUnsupported swift compiler version, expecting `swiftlang` keyword in `swiftc --version`\n".red if swift_version.length == 0
     return swift_version
   end
 

data/lib/pod_builder/info.rb

@@ -60,7 +60,7 @@ module PodBuilder
         
         return { "repo": "local" }
       else
-        raise "\n\nFailed extracting version from line:\n#{line}\n\n".red
+        raise "\n\nFailed extracting version from line:\n#{line}\n".red
       end
     end
 

data/lib/pod_builder/install.rb

@@ -45,7 +45,7 @@ begin
         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".red
+          raise "\n\nBuildType not found. Open an issue reporting your CocoaPods version\n".red
         end
       else
         swz_build_type()
@@ -139,7 +139,7 @@ module PodBuilder
 
   class Install
     # This method will generate prebuilt data by building from "/tmp/pod_builder/Podfile"
-    def self.podfile(podfile_content, podfile_items, build_configuration)
+    def self.podfile(podfile_content, podfile_items, argument_pods, build_configuration)
       puts "Preparing build Podfile".yellow
       
       PodBuilder::safe_rm_rf(Configuration.build_path)
@@ -160,7 +160,7 @@ module PodBuilder
         lock_file = "#{Configuration.build_path}/pod_builder.lock"
         FileUtils.touch(lock_file)
         
-        prebuilt_entries = use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
+        prebuilt_entries = use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items, argument_pods)
         
         install
         
@@ -247,7 +247,7 @@ module PodBuilder
     def self.license_specifiers
       acknowledge_file = "#{Configuration.build_path}/Pods/Target Support Files/Pods-DummyTarget/Pods-DummyTarget-acknowledgements.plist"
       unless File.exist?(acknowledge_file)
-        raise "\n\nLicense file not found".red
+        raise "\n\nLicense file not found\n".red
       end
       
       plist = CFPropertyList::List.new(:file => acknowledge_file)
@@ -280,45 +280,67 @@ module PodBuilder
       return podfile_content
     end
     
-    def self.use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
+    def self.use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items, argument_pods)
       podfile_content = File.read(podfile_path)
       
       replaced_items = []
 
-      if OPTIONS.has_key?(:force_rebuild)
-        podfile_content.gsub!("%%%prebuilt_root_paths%%%", "{}")
-      else
-        download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
+      download # Copy files under #{Configuration.build_path}/Pods so that we can determine build folder hashes
 
-        gitignored_files = PodBuilder::gitignoredfiles
+      gitignored_files = PodBuilder::gitignoredfiles
 
-        prebuilt_root_paths = Hash.new
+      prebuilt_root_paths = Hash.new
 
-        # 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|
-          podspec_path = item.prebuilt_podspec_path
-          if last_build_folder_hash = build_folder_hash_in_prebuilt_info_file(item)
-            if last_build_folder_hash == build_folder_hash(item, gitignored_files)
-              puts "No changes detected to '#{item.root_name}', will skip rebuild".blue
+      puts "Optimizing build".yellow
+      puts "Build strategy".blue
 
-              replaced_items.push(item)
+      prebuild_log = lambda { |item, reason|
+        if item.is_prebuilt
+          puts "#{item.root_name} is prebuilt"
+        else
+          puts "#{item.root_name} from source #{reason}".blue
+        end
+      }
 
-              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 "\n\nFailed finding pod entry for '#{replace_item.name}'".red unless replace_line_found
-                podfile_content.gsub!(/#{replace_regex}/, replace_item.prebuilt_entry(true, true))
+      # 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 }.sort_by { |t| t.root_name } # Return one podfile_item per root_name
+      if OPTIONS.has_key?(:force_rebuild)
+        rebuild_pods = items.select { |t| argument_pods.include?(t.root_name) }
 
-                prebuilt_root_paths[replace_item.root_name] = PodBuilder::prebuiltpath
-              end
-            end
-          end
+        rebuild_pods.each do |item|
+          prebuild_log.call(item, "")
+        end
+
+        items -= rebuild_pods
+      end
+      
+      items.each do |item|
+        podspec_path = item.prebuilt_podspec_path
+        unless last_build_folder_hash = build_folder_hash_in_prebuilt_info_file(item)
+          prebuild_log.call(item, "(folder hash missing)")
+          next
         end
+        
+        if last_build_folder_hash == build_folder_hash(item, gitignored_files)
+          puts "#{item.root_name} reuse PodBuilder cache"
 
-        podfile_content.gsub!("%%%prebuilt_root_paths%%%", prebuilt_root_paths.to_s)
+          replaced_items.push(item)
+
+          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 "\n\nFailed finding pod entry for '#{replace_item.name}'\n".red unless replace_line_found
+            podfile_content.gsub!(/#{replace_regex}/, replace_item.prebuilt_entry(true, true))
+
+            prebuilt_root_paths[replace_item.root_name] = PodBuilder::prebuiltpath
+          end
+        else
+          prebuild_log.call(item, "(folder hash mismatch)")
+        end
       end
 
+      podfile_content.gsub!("%%%prebuilt_root_paths%%%", prebuilt_root_paths.to_s)
+
       File.write(podfile_path, podfile_content)
 
       return replaced_items
@@ -457,15 +479,16 @@ module PodBuilder
           unless File.file?(path)
             next
           end
-          
+
           path = File.expand_path(path)
           rel_path = path.gsub(rootpath, "")[1..]
-          unless exclude_files.include?(rel_path)
+
+          unless exclude_files.any? { |t| rel_path.start_with?(t) }
             file_hashes.push(Digest::MD5.hexdigest(File.read(path)))
           end
         end
         
-        return Digest::MD5.hexdigest(file_hashes.join)
+        return Digest::MD5.hexdigest(file_hashes.sort.join)
       else
         # Pod folder might be under .gitignore
         item_path = "#{Configuration.build_path}/Pods/#{podfile_item.root_name}"

data/lib/pod_builder/licenses.rb

@@ -12,19 +12,19 @@
       
         if current_licenses.count > 0 
           licenses_header = current_licenses.shift
-          raise "\n\nUnexpected license found in header".red if licenses_header.has_key?("License")
+          raise "\n\nUnexpected license found in header\n".red if licenses_header.has_key?("License")
         end
         if current_licenses.count > 0 
           license_footer = current_licenses.pop
-          raise "\n\nUnexpected license found in footer".red if license_footer.has_key?("License")
+          raise "\n\nUnexpected license found in footer\n".red if license_footer.has_key?("License")
         end
       end
 
       if licenses.count > 0
         licenses_header = licenses.shift
-        raise "\n\nUnexpected license found in header".red if licenses_header.has_key?("License")
+        raise "\n\nUnexpected license found in header\n".red if licenses_header.has_key?("License")
         license_footer = licenses.pop
-        raise "\n\nUnexpected license found in footer".red if license_footer.has_key?("License")
+        raise "\n\nUnexpected license found in footer\n".red if license_footer.has_key?("License")
 
         lincenses_titles = licenses.map { |x| x["Title"] }
         current_licenses.select! { |x| !lincenses_titles.include?(x["Title"]) }

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) {}", "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".red unless items.count > 0
+      raise "\n\nno items\n".red unless items.count > 0
 
       sources = analyzer.sources
       
@@ -354,7 +354,7 @@ module PodBuilder
 
         if stripped_line.match(/(pod')(.*?)(')/) != nil
           starting_def_found = stripped_line.start_with?("def") && (line.match("\s*def\s") != nil)
-          raise "\n\nUnsupported single line def/pod. `def` and `pod` shouldn't be on the same line, please modify the following line:\n#{line}".red if starting_def_found
+          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
     end
@@ -396,9 +396,9 @@ module PodBuilder
       if target_settings.count == 1
         return target_settings.first
       elsif target_settings.count > 1
-        raise "\n\n'use_frameworks!' should be declared only once at Podfile root level (not nested in targets)".red
+        raise "\n\n'use_frameworks!' should be declared only once at Podfile root level (not nested in targets)\n".red
       else
-        raise "\n\nFailed detecting use_frameworks!"
+        raise "\n\nFailed detecting use_frameworks!\n".red
       end
 
       return true
@@ -443,13 +443,13 @@ module PodBuilder
     def self.project_swift_version(analyzer)
       swift_versions = analyzer.instance_variable_get("@result").targets.map { |x| x.target_definition.swift_version }.compact.uniq
 
-      raise "\n\nFound different Swift versions in targets. Expecting one, got `#{swift_versions}`".red if swift_versions.count > 1
+      raise "\n\nFound different Swift versions in targets. Expecting one, got `#{swift_versions}`\n".red if swift_versions.count > 1
 
       return swift_versions.first || PodBuilder::system_swift_version
     end
 
     def self.podfile_items_at(podfile_path, include_prebuilt = false)
-      raise "\n\nExpecting basepath folder!".red if !File.exist?(PodBuilder::basepath("Podfile"))
+      raise "\n\nExpecting basepath folder!\n".red if !File.exist?(PodBuilder::basepath("Podfile"))
 
       if File.basename(podfile_path) != "Podfile"
         File.rename(PodBuilder::basepath("Podfile"), PodBuilder::basepath("Podfile.tmp"))
@@ -607,12 +607,12 @@ module PodBuilder
       base = File.expand_path(File.join(PodBuilder::project_path, ".."))
       bin_js = Dir.glob("#{base}/node_modules/@react-native-community/cli/build/bin.js")
 
-      raise "\n\nReact native cli bin_js not found! Did you run yarn install?".red unless bin_js.count == 1
+      raise "\n\nReact native cli bin_js not found! Did you run yarn install?\n".red unless bin_js.count == 1
       bin_js = bin_js.first
 
       config_dest_path = PodBuilder::basepath("rn_config.json")
 
-      raise "\n\nFailed generating react native configuration file".red unless system("node '#{bin_js}' config > #{config_dest_path}")
+      raise "\n\nFailed generating react native configuration file\n".red unless system("node '#{bin_js}' config > #{config_dest_path}")
       
       content = File.read(config_dest_path)
 
@@ -624,7 +624,7 @@ module PodBuilder
         json["project"]["ios"]["sourceDir"] = "./"
         json["project"]["ios"]["podfile"] = "./"  
       rescue => exception
-        raise "\n\nFailed updating react native configuration json".red
+        raise "\n\nFailed updating react native configuration json\n".red
       end
       
       File.write(config_dest_path, JSON.pretty_generate(json))

data/lib/pod_builder/podfile/pre_actions_swizzles.rb

@@ -24,7 +24,7 @@ class Pod::Generator::EmbedFrameworksScript
   alias_method :swz_initialize, :initialize
   
   def initialize(*args)
-    raise "Unsupported CocoaPods version" if (args.count == 0 || args.count > 2)
+    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|

data/lib/pod_builder/podspec.rb

@@ -142,7 +142,7 @@ module PodBuilder
         end
         if !install_using_frameworks && spec_var == "p1" && vendored_libraries.map { |t| File.basename(t) }.include?("lib#{item.root_name}.a" )
           module_path_files = Dir.glob(PodBuilder.prebuiltpath("#{item.root_name}/**/#{item.root_name}.modulemap"))
-          raise "\n\nToo many module maps found for #{item.root_name}".red if module_path_files.count > 1
+          raise "\n\nToo many module maps found for #{item.root_name}\n".red if module_path_files.count > 1
 
           rel_path = Pathname.new(PodBuilder::prebuiltpath).relative_path_from(Pathname.new(PodBuilder::project_path("Pods"))).to_s
           prebuilt_root_var = "#{item.root_name.upcase.gsub("-", "_")}_PREBUILT_ROOT"

data/lib/pod_builder/rome/post_install.rb

@@ -21,7 +21,7 @@ module PodBuilder
       when "tvossimulator" then @build_destination = "generic/platform=tvOS Simulator"
       when "watchos" then @build_destination = "generic/platform=watchOS"
       when "watchossimulator" then @build_destination = "generic/platform=watchOS Simulator"
-      else raise "\n\nUnknown platform '#{platform_name}'".red end
+      else raise "\n\nUnknown platform '#{platform_name}'\n".red end
     end
   end
 
@@ -65,7 +65,7 @@ module PodBuilder
         `xcrun lipo -remove arm64 #{simulator_lib} -o #{simulator_lib}`
       end
       
-      raise "Lipo failed on #{device_lib}" unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
+      raise "\n\nLipo failed on #{device_lib}\n".red unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
       
       merge_header_into(device_swift_header_path, simulator_swift_header_path)
       
@@ -116,7 +116,7 @@ module PodBuilder
         `xcrun lipo -remove arm64 #{simulator_lib} -o #{simulator_lib}`
       end
       
-      raise "Lipo failed on #{device_lib}" unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
+      raise "\n\nLipo failed on #{device_lib}\n".red unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
       
       device_headers = Dir.glob("#{device_base}/**/*.h")
       simulator_headers = Dir.glob("#{simulator_base}/**/*.h")
@@ -247,7 +247,7 @@ module PodBuilder
     output = stdout + stderr
     unless status.success?
       if raise_on_failure
-        raise "#{full_command}\n\n#{output}"
+        raise "\n\n#{full_command}\n\n#{output}\n".red
       else
         UI.message("[!] Failed: #{full_command}".red)
       end
@@ -307,7 +307,7 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
   build_dir.rmtree if build_dir.directory?
 
   targets = installer_context.umbrella_targets.select { |t| t.specs.any? }
-  raise "\n\nUnsupported target count".red unless targets.count == 1
+  raise "\n\nUnsupported target count\n".red unless targets.count == 1
   target = targets.first
 
   if build_xcframeworks
@@ -322,11 +322,11 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
     when :osx then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("macos", configuration)]
     when :tvos then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("tvos", configuration), PodBuilder::XcodeBuildSettings.new("tvossimulator", configuration)]
     when :watchos then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("watchos", configuration), PodBuilder::XcodeBuildSettings.new("watchossimulator", configuration)]
-    else raise "\n\nUnknown platform '#{target.platform_name}'".red end
+    else raise "\n\nUnknown platform '#{target.platform_name}'\n".red end
   
     xcodebuild_settings.each do |xcodebuild_setting|
       puts "Building xcframeworks for #{xcodebuild_setting.platform_name}".yellow
-      raise "\n\n#{xcodebuild_setting.build_destination} xcframework archive failed!".red if !system("xcodebuild archive -project #{project_path.to_s} -scheme Pods-DummyTarget -configuration #{xcodebuild_setting.configuration} -destination '#{xcodebuild_setting.build_destination}' -archivePath '#{build_dir}/#{xcodebuild_setting.platform_name}' SKIP_INSTALL=NO > /dev/null 2>&1")
+      raise "\n\n#{xcodebuild_setting.build_destination} xcframework archive failed!\n".red if !system("xcodebuild archive -project #{project_path.to_s} -scheme Pods-DummyTarget -configuration #{xcodebuild_setting.configuration} -destination '#{xcodebuild_setting.build_destination}' -archivePath '#{build_dir}/#{xcodebuild_setting.platform_name}' SKIP_INSTALL=NO > /dev/null 2>&1")
     end
 
     built_items = Dir.glob("#{build_dir}/#{xcodebuild_settings[0].platform_name}.xcarchive/Products/Library/Frameworks/*").reject { |t| File.basename(t, ".*") == "Pods_DummyTarget" }
@@ -348,7 +348,7 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
       framework_name = File.basename(built_item_paths.first, ".*")
       xcframework_path = "#{base_destination}/#{framework_name}/#{framework_name}.xcframework"
       framework_params = built_item_paths.map { |t| "-framework '#{t}'"}.join(" ")
-      raise "\n\nFailed packing xcframework!".red if !system("xcodebuild -create-xcframework #{framework_params} -output '#{xcframework_path}' > /dev/null 2>&1")      
+      raise "\n\nFailed packing xcframework!\n".red if !system("xcodebuild -create-xcframework #{framework_params} -output '#{xcframework_path}' > /dev/null 2>&1")      
 
       if enable_dsym
         xcodebuild_settings.each do |xcodebuild_setting|
@@ -361,7 +361,7 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
           end  
         end
       else
-        raise "Not implemented"
+        raise "\n\nNot implemented\n".red
       end
     end
 
@@ -377,7 +377,7 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
     when [:osx, false] then PodBuilder::xcodebuild(sandbox, target.cocoapods_target_label, configuration, PodBuilder::Configuration.deterministic_build, prebuilt_root_paths)
     when [:tvos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build, prebuilt_root_paths)
     when [:watchos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build, prebuilt_root_paths)
-    else raise "\n\nUnknown platform '#{target.platform_name}'".red end
+    else raise "\n\nUnknown platform '#{target.platform_name}'\n".red end
 
     raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
     
@@ -436,7 +436,7 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
         FileUtils.mv(dsym_source, sandbox_root.parent)
       end
     else
-      raise "Not implemented"
+      raise "\n\nNot implemented\n".red
     end    
   end
 

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "3.0.1"
+  VERSION = "3.1.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Prebuild CocoaPods pods