pod-builder 2.0.0.beta.32 → 2.0.0.beta.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d2d2da339c3c50f17484abe18c4f4dd8080d4344bc526b393c95c3d166c9851
-  data.tar.gz: 483067dfc8cd9b914dfa9768afc33cf067f7807a9b09ce3f1b3c86c67b4c08a6
+  metadata.gz: fd2f1ce8ec492d776fb38d6a21bd80f2e612b22d1bd820440a0a5930d1bf70c6
+  data.tar.gz: 5e11315787531d4f8bd0d5975eddc0e2d2611aa21f594758b13ee51747fa570b
 SHA512:
-  metadata.gz: e87ca666254ff92c0c729412acf61d02e822b55933524d07ed2ec13ea38b33a29f13fac2ec6eef221f373626b50f690ec45235f7874910374123806d0a0d6122
-  data.tar.gz: 945398f22ccc35ac924a16e6fe3a95be6343fd0ee335f8f9f94082004193113566884a49043cefac8bf6efb705db79d774dab304e56ec15fe468acdcf6e687e4
+  metadata.gz: 7a91b2733fb7dde282bdc6e6fe45d270dd65fa971f24c39adca133683aad9b9adad5ae7d3ecc9978edff40346450852458cbc5df3ffc34c5bc16f451487c8819
+  data.tar.gz: 972cd2864b2384fdae50af8cc97ebb2ab5f0381630f5ca557a67b57d62ecb6956bc7f802bc738e7b50bb35cd52418e3f0211d17174ce8b2710bec7f6c501d339

data/README.md

@@ -25,15 +25,15 @@ You can the initialize your project to use the tool using the `init` command
 
  This will add a _PodBuilder_ folder which will contain all files needed and generated by the PodBuilder.
 
- To prebuild all dependencies run
-
-    $ pod_builder build_all
-
  To prebuild just one or more specific dependencies run
 
     $ pod_builder build Pod1 Pod2
 
-This will generate the pod frameworks which can be committed to your repo for a much faster compilation.
+ To prebuild all dependencies run
+
+    $ pod_builder build_all
+
+This will generate the pod frameworks which can be committed to your repo (using git LFS is highly suggested) for much faster compilation.
 
 Should PodBuilder not work the way you expect you can get rid of it by running
 
@@ -61,7 +61,7 @@ This acts as a sort of lockfile and reflects the current state of what is instal
 
 ## Commands
 
-Podbuilder comes with a set of commands:
+PodBuilder comes with a rich set of commands:
 
 - `init`: initializes a project to use PodBuilder
 - `deintegrate`: deintegrates PodBuilder's initialization
@@ -85,7 +85,7 @@ The following will happen:
 
 - Create a _PodBuilder_ folder in your repo's root.
 - Copy your original Podfile to _PodBuilder/Podfile_ (PodBuilder-Podfile)
-- Add an initially empty _PodBuilder.json_ configuration file
+- Add a _PodBuilder.json_ configuration file
 - Modify the original Podfile (Application-Podfile) with some minor customizations
 - Create/Update your Gemfile adding the `gem 'pod-builder'` entry
 
@@ -120,7 +120,7 @@ Will recompile all pods to the versions defined in the Restore-Podfile. You woul
 
 #### `install_sources` command
 
-When using PodBuilder you loose ability to directly access to the source code of a pod. To overcome this limitation you can use this command which downloads the pod's source code to _PodBuilder/Sources_ and with some [tricks](https://medium.com/@t.camin/debugging-prebuilt-frameworks-c9f52d42600b) restores the ability to use the debugger and step into the code of your prebuilt dependencies. This can be very helpful to catch the exact location of a crash when it occurs (showing something more useful than assembly code). It is however advisable to switch to the original pod when doing any advanced debugging during development of code that involves a pod.
+Once you prebuild a pod you can no longer debug its origianl code, to overcome this limitation you can use this command which downloads the pod's source code to _PodBuilder/Sources_ and with some [tricks](https://medium.com/@t.camin/debugging-prebuilt-frameworks-c9f52d42600b) restores the ability to use the debugger and step into the code of your prebuilt dependencies. This can be very helpful to catch the exact location of a crash when it occurs (showing something more useful than assembly code). It is however advisable to switch to the original pod when doing any advanced debugging during development of code that involves a pod.
 
 #### `generate_lldbinit` command
 
@@ -257,7 +257,7 @@ Xcode build settings to use. You can override the default values which are:
 } 
 ```
 
-If your project uses bitcode change "ENABLE_BITCODE" to "YES".
+If your project uses bitcode change "ENABLE_BITCODE" to "YES". Please note that all pods that have dependencies to XCTest need to be add a `"ENABLE_BITCODE": "NO"` to the `build_settings_overrides` below.
 
 #### `build_settings_overrides`
 

data/exe/pod_builder

@@ -76,9 +76,9 @@ Options:
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
         end
-        # opts.on("-a", "--auto-resolve-deps", "Resolve pod dependencies automatically") do |o|
-        #   OPTIONS[:auto_resolve_dependencies] = 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
@@ -282,7 +282,7 @@ Usage:
         opts.banner = "
 Usage:
         
-    $ pod_builder switch [OPTIONS] PODNAME[s]
+    $ pod_builder switch [OPTIONS] <PODNAME...>
 
       Switch integration between prebuilt/development/default pod version. Multiple space separated pods can be passed
         
@@ -297,8 +297,14 @@ Options:
         opts.on("-s", "--default", "Default version specified in PodBuilder-Podfile") do |o|
           OPTIONS[:switch_mode] = "default"
         end
-        opts.on("-a", "--all", "Include dependencies") do |o|
-          OPTIONS[:switch_all] = true
+        opts.on("-c", "--child-deps", "Include dependencies of the specified <PODNAME...>") do |o|
+          OPTIONS[:resolve_child_dependencies] = true
+        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("-u", "--skip-repo-update", "Skip CocoaPods repo update (only when passing --parent-deps") do |o|
+          OPTIONS[:update_repos] = false
         end
       end,
       :call => [        

data/lib/pod_builder/command/build.rb

@@ -72,6 +72,16 @@ module PodBuilder
         podfiles_items = [pods_to_build_debug] + [pods_to_build_release]
 
         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 
+          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
+          end  
+        end
         
         install_result = InstallResult.new
         podfiles_items.reject { |x| x.empty? }.each do |podfile_items|
@@ -118,6 +128,14 @@ module PodBuilder
 
       private
 
+      def self.prepare_defines_modules_override(all_buildable_items)
+        all_buildable_items.each do |item|
+          unless item.defines_module.nil?
+            Pod::PodTarget.modules_override[item.root_name] = item.defines_module
+          end
+        end
+      end
+
       def self.check_not_building_subspecs(pods_to_build)
         pods_to_build.each do |pod_to_build|
           if pod_to_build.include?("/")
@@ -150,7 +168,7 @@ module PodBuilder
       end
 
       def self.check_not_building_development_pods(pods)
-        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (OPTIONS[:allow_warnings].nil?  && Configuration.allow_building_development_pods == false)
+        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0 && (OPTIONS[:allow_warnings].nil?  && Configuration.allow_building_development_pods == false && Configuration.react_native_project == false)
           pod_names = development_pods.map(&:name).join(", ")
           raise "\n\nThe following pods are in development mode: `#{pod_names}`, won't proceed building.\n\nYou can ignore this error by passing the `--allow-warnings` flag to the build command\n".red
         end
@@ -187,7 +205,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)
 
-        return pods_to_build
+        if OPTIONS[:resolve_parent_dependencies]
+          dependencies = []
+          buildable_items.each do |pod|
+            if !(pod.dependencies(buildable_items) & pods_to_build).empty?
+              dependencies.push(pod)
+            end
+          end
+          pods_to_build += dependencies
+        end
+
+        return pods_to_build.uniq
       end      
     end
   end

data/lib/pod_builder/command/switch.rb

@@ -24,8 +24,29 @@ module PodBuilder
           pod_names_to_switch.push(pod_name_to_switch)
         end
 
+        if OPTIONS[:resolve_parent_dependencies] == true
+          install_update_repo = OPTIONS.fetch(:update_repos, true)
+          installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
+  
+          all_buildable_items = Analyze.podfile_items(installer, analyzer)
+
+          pod_names_to_switch.each do |pod_name|
+            if pod = (all_buildable_items.detect { |t| t.name == pod_name } || all_buildable_items.detect { |t| t.root_name == pod_name })
+              dependencies = []
+              all_buildable_items.each do |pod|
+                if !(pod.dependency_names & pod_names_to_switch).empty?
+                  dependencies.push(pod.root_name)
+                end
+              end
+              pod_names_to_switch += dependencies
+            end
+          end
+
+          pod_names_to_switch.uniq!
+        end
+
         dep_pod_names_to_switch = []
-        if OPTIONS[:switch_all] == true
+        if OPTIONS[:resolve_child_dependencies] == true
           pod_names_to_switch.each do |pod|
             podspec_path = PodBuilder::prebuiltpath("#{pod}/#{pod}.podspec")
             unless File.exist?(podspec_path)

data/lib/pod_builder/command/update.rb

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

data/lib/pod_builder/configuration.rb

@@ -18,27 +18,29 @@ module PodBuilder
       "Google-Mobile-Ads-SDK" => {
         "module_name": "GoogleMobileAds"
       },
-      "React-jsiexecutor" => {
-        "remove_module_maps": ["glog"]
-      }, 
-      "React-Core" => {
-        "remove_module_maps": ["glog"]
+      "glog" => {
+        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" }
       },
-      "React-Core/Default" => {
-        "public_headers": "React/**/*.{h}"
+      "DoubleConversion" => {
+        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" }
       },
-      "React-jsi" => {
-        "remove_module_maps": ["glog"]
-      },
-      "React-cxxreact" => {
-        "remove_module_maps": ["glog"]
-      }, 
       "Folly" => {
-        "remove_module_maps": ["glog"]
+        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" }
+      },
+      "Flipper-DoubleConversion" => {
+        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" }
+      },
+      "Flipper-Folly" => {
+        "pod_target_xcconfig": { "DEFINES_MODULE": "NO" }
+      }
+    }.freeze
+    DEFAULT_BUILD_SETTINGS_OVERRIDES = {
+      "SBTUITestTunnelClient" => {
+        "ENABLE_BITCODE": "NO"
       }
     }.freeze
     DEFAULT_SKIP_PODS = ["GoogleMaps"]
-    DEFAULT_FORCE_PREBUILD_PODS = ["GoogleTagManager"]
+    DEFAULT_FORCE_PREBUILD_PODS = []
     DEFAULT_BUILD_SYSTEM = "Latest".freeze # either Latest (New build system) or Legacy (Standard build system)
     DEFAULT_LIBRARY_EVOLUTION_SUPPORT = false
     DEFAULT_PLATFORMS = ["iphoneos", "iphonesimulator", "appletvos", "appletvsimulator"].freeze
@@ -46,6 +48,7 @@ module PodBuilder
     DEFAULT_BUILD_USING_REPO_PATHS = false
     
     private_constant :DEFAULT_BUILD_SETTINGS
+    private_constant :DEFAULT_BUILD_SETTINGS_OVERRIDES
     private_constant :DEFAULT_BUILD_SYSTEM
     private_constant :DEFAULT_LIBRARY_EVOLUTION_SUPPORT
     
@@ -82,7 +85,7 @@ module PodBuilder
     
     @allow_building_development_pods = false
     @build_settings = DEFAULT_BUILD_SETTINGS
-    @build_settings_overrides = {}
+    @build_settings_overrides = DEFAULT_BUILD_SETTINGS_OVERRIDES
     @build_system = DEFAULT_BUILD_SYSTEM
     @library_evolution_support = DEFAULT_LIBRARY_EVOLUTION_SUPPORT
     @base_path = "PodBuilder" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME

data/lib/pod_builder/install.rb

@@ -20,7 +20,12 @@ begin
       
       if overrides = PodBuilder::Configuration.spec_overrides[spec.name]
         overrides.each do |k, v|
-          spec.attributes_hash[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
       
@@ -47,6 +52,24 @@ begin
       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
@@ -71,28 +94,6 @@ begin
       return res
     end
   end  
-  
-  class Pod::Target::BuildSettings
-    alias_method :swz_save_as, :save_as
-
-    @specs_remove_module_maps = Hash.new
-
-    class << self
-      attr_accessor :specs_remove_module_maps
-    end
-
-    def save_as(path)
-      Pod::Target::BuildSettings.specs_remove_module_maps.each do |root_name, module_maps_to_remove|
-        if target.name == root_name
-          module_maps_to_remove.each do |module_map_to_remove|
-            xcconfig.attributes["OTHER_CFLAGS"] = xcconfig.attributes["OTHER_CFLAGS"].gsub(/-fmodule-map-file=\S*#{module_map_to_remove}.modulemap.*?(\s|$)/, '')
-           end
-        end
-      end
-     
-      swz_save_as(path)
-    end
-  end
 rescue LoadError
   # CocoaPods 1.6.2 or earlier
 end
@@ -160,8 +161,6 @@ module PodBuilder
         FileUtils.touch(lock_file)
         
         prebuilt_entries = use_prebuilt_entries_for_unchanged_pods(podfile_path, podfile_items)
-
-        prepare_for_static_framework_workarounds(podfile_content, podfile_items)
         
         install
         
@@ -177,10 +176,13 @@ module PodBuilder
         return InstallResult.new(licenses, prebuilt_info)
       rescue Exception => e
         if File.directory?("#{Configuration.build_path}/Pods/Pods.xcodeproj")
+          activate_pod_scheme()
+
           if ENV["DEBUGGING"]
             system("xed #{Configuration.build_path}/Pods")  
           elsif !OPTIONS.has_key?(:no_stdin_available)
             confirm = ask("\n\nOh no! Something went wrong during prebuild phase! Do you want to open the prebuild project to debug the error, you will need to add and run the Pods-Dummy scheme? [Y/N] ".red) { |yn| yn.limit = 1, yn.validate = /[yn]/i }
+
             if confirm.downcase == 'y'
               system("xed #{Configuration.build_path}/Pods")  
             end
@@ -241,16 +243,6 @@ module PodBuilder
       return ret
     end
     private 
-
-    def self.prepare_for_static_framework_workarounds(podfile_content, podfile_items)
-      unless podfile_content.include?("use_modular_headers!")
-        return
-      end
-
-      podfile_items.each do |podfile_item|
-        Pod::Target::BuildSettings.specs_remove_module_maps[podfile_item.root_name] = podfile_item.remove_module_maps
-      end
-    end
     
     def self.license_specifiers
       acknowledge_file = "#{Configuration.build_path}/Pods/Target Support Files/Pods-DummyTarget/Pods-DummyTarget-acknowledgements.plist"
@@ -335,7 +327,7 @@ module PodBuilder
     end
     
     def self.install
-      puts "Prebuilding items".yellow
+      puts "Preparing build".yellow
       
       CLAide::Command::PluginManager.load_plugins("cocoapods")
       
@@ -403,9 +395,11 @@ module PodBuilder
           next
         end
 
-        destination_folder = PodBuilder::prebuiltpath(root_name)
-        FileUtils.mkdir_p(destination_folder)
-        FileUtils.cp_r("#{source_path}/.", destination_folder)  
+        unless Dir.glob("#{source_path}/**/*").select { |t| File.file?(t) }.empty?
+          destination_folder = PodBuilder::prebuiltpath(root_name)
+          FileUtils.mkdir_p(destination_folder)
+          FileUtils.cp_r("#{source_path}/.", destination_folder)  
+        end
       end
       
       # Folder won't exist if no dSYM were generated (all static libs)
@@ -495,5 +489,19 @@ module PodBuilder
         return replace_path
       end
     end 
+
+    def self.activate_pod_scheme
+      if scheme_file = Dir.glob("#{Configuration.build_path}/Pods/**/xcschememanagement.plist").first
+        plist = CFPropertyList::List.new(:file => scheme_file)
+        data = CFPropertyList.native_types(plist.value)
+
+        if !data.dig("SchemeUserState", "Pods-DummyTarget.xcscheme").nil?
+          data["SchemeUserState"]["Pods-DummyTarget.xcscheme"]["isShown"] = true
+        end
+
+        plist.value = CFPropertyList.guess(data)
+        plist.save(scheme_file, CFPropertyList::List::FORMAT_BINARY)  
+      end
+    end
   end
 end

data/lib/pod_builder/podfile.rb

@@ -47,6 +47,9 @@ module PodBuilder
         build_settings["CLANG_ENABLE_MODULE_DEBUGGING"] = "NO"
         build_settings["OTHER_SWIFT_FLAGS"] = "$(inherited) -Xfrontend -no-clang-module-breadcrumbs"
 
+        # Ignore deprecation warnings
+        build_settings["GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS"] = "NO"
+
         # Improve compile speed
         build_settings["COMPILER_INDEX_STORE_ENABLE"] = "NO"
         build_settings["SWIFT_INDEX_STORE_ENABLE"] = "NO"
@@ -391,9 +394,6 @@ module PodBuilder
     def self.install_using_frameworks(analyzer)
       target_settings = analyzer.podfile.target_definition_list.map(&:uses_frameworks?).uniq
       if target_settings.count == 1
-        if target_settings.first == false && ENV["DEBUGGING"].nil?
-          raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at Podfile root level (not nested in targets)".red
-        end
         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

data/lib/pod_builder/podfile_item.rb

@@ -75,13 +75,13 @@ module PodBuilder
     #
     attr_accessor :is_external
 
-    # @return [String] The pod's build configuration
+    # @return [String] Header directory name
     #
-    attr_accessor :build_configuration
+    attr_accessor :header_dir
 
-    # @return [Array<String>] When building static frameworks we sometimes have to remove module maps from Other C flags to make compilation succeed
+    # @return [String] The pod's build configuration
     #
-    attr_accessor :remove_module_maps
+    attr_accessor :build_configuration
 
     # @return [String] The pod's vendored frameworks
     #
@@ -130,6 +130,10 @@ module PodBuilder
     # @return [Array<String>] Default subspecs
     #
     attr_accessor :default_subspecs
+
+    # @return [Bool] Defines module
+    #
+    attr_accessor :defines_module
     
     # Initialize a new instance
     #
@@ -159,6 +163,11 @@ module PodBuilder
         @commit = spec.root.source[:commit]
         @is_external = false
       end    
+
+      @defines_module = nil # nil is not specified
+      if override = spec.attributes_hash.dig("pod_target_xcconfig", "DEFINES_MODULE")
+        @defines_module = (override == "YES")
+      end
       
       @vendored_frameworks = extract_vendored_frameworks(spec, all_specs)
       @vendored_libraries = extract_vendored_libraries(spec, all_specs)
@@ -176,6 +185,8 @@ module PodBuilder
       @libraries += extract_array(spec, "library")
       @libraries += extract_array(spec, "libraries")  
 
+      @header_dir = spec.attributes_hash["header_dir"]
+
       @version = spec.root.version.version
       @available_versions = spec.respond_to?(:spec_source) ? spec.spec_source.versions(@root_name)&.map(&:to_s) : [@version]
       
@@ -212,8 +223,6 @@ module PodBuilder
       @build_configuration = spec.root.attributes_hash.dig("pod_target_xcconfig", "prebuild_configuration") || "release"
       @build_configuration.downcase!
 
-      @remove_module_maps = spec.root.attributes_hash["remove_module_maps"] || []
-
       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}")

data/lib/pod_builder/podspec.rb

@@ -39,7 +39,7 @@ module PodBuilder
         existing_vendored_frameworks = vendored_frameworks.select(&if_exists)
         existing_vendored_frameworks_basename = vendored_frameworks.map { |t| File.basename(t) }.select(&if_exists)
         vendored_frameworks = (existing_vendored_frameworks + existing_vendored_frameworks_basename).uniq
-        
+
         vendored_libraries = item.vendored_libraries
         if install_using_frameworks
           existing_vendored_libraries = vendored_libraries.map { |t| "#{item.module_name}/#{t}" }.select(&if_exists)
@@ -56,10 +56,10 @@ module PodBuilder
 
           exclude_files = static_frameworks.map { |x| x.vendored_framework_path.nil? ? nil : "#{x.vendored_framework_path}/Info.plist" }.compact.flatten.uniq
           public_headers = []
-        else
+        else          
           public_headers = Dir.glob(PodBuilder::prebuiltpath("#{item.root_name}/#{item.root_name}/Headers/**/*.h"))
           vendored_libraries +=  ["#{item.root_name}/lib#{item.root_name}.a"]
-          vendored_libraries.map! { |t| "#{item.root_name}/#{t}" }.select(&if_exists)
+          vendored_libraries = vendored_libraries.select(&if_exists)
            
           resources = ["#{item.root_name}/*.{nib,bundle,xcasset,strings,png,jpg,tif,tiff,otf,ttf,ttc,plist,json,caf,wav,p12,momd}"]
 
@@ -97,6 +97,9 @@ module PodBuilder
         if public_headers.count > 0
           podspec += "#{indentation}#{spec_var}.public_header_files = '#{item.root_name}/Headers/**/*.h'\n"
         end
+        if !item.header_dir.nil? && !install_using_frameworks
+          podspec += "#{indentation}#{spec_var}.header_dir = '#{item.header_dir}'\n"
+        end
 
         if item.xcconfig.keys.count > 0
           xcconfig = Hash.new
@@ -122,20 +125,26 @@ module PodBuilder
             podspec += "#{indentation}#{spec_var}.xcconfig = #{xcconfig.to_s}\n"
           end
         end
-        if !install_using_frameworks && spec_var == "p1"
+        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
+
+          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"
+
+          static_cfg = Hash.new
           if module_path_file = module_path_files.first
-            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"
             module_map_rel = module_path_file.gsub(PodBuilder::prebuiltpath("#{item.root_name}/#{item.root_name}/"), "")
-            static_cfg = { prebuilt_root_var => "$(PODS_ROOT)/#{rel_path}",
-                          "SWIFT_INCLUDE_PATHS" => "$(inherited) \"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}\"",
+            static_cfg = { "SWIFT_INCLUDE_PATHS" => "$(inherited) \"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}\"",
                           "OTHER_CFLAGS" => "$(inherited) -fmodule-map-file=\"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}/#{module_map_rel}\"",
                           "OTHER_SWIFT_FLAGS" => "$(inherited) -Xcc -fmodule-map-file=\"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}/#{module_map_rel}\""
-                          }
-            podspec += "#{indentation}#{spec_var}.xcconfig = #{static_cfg.to_s}\n"
-                        end
+                          }            
+          end
+          static_cfg[prebuilt_root_var] = "$(PODS_ROOT)/#{rel_path}"
+
+          podspec += "#{indentation}#{spec_var}.xcconfig = #{static_cfg.to_s}\n"
+          # This seems to be a viable workaround to https://github.com/CocoaPods/CocoaPods/issues/9559 and https://github.com/CocoaPods/CocoaPods/issues/8454
+          podspec += "#{indentation}#{spec_var}.user_target_xcconfig = { \"OTHER_LDFLAGS\" => \"$(inherited) -L\\\"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}\\\" -l\\\"#{item.root_name}\\\"\" }\n"
         end
   
         deps = item.dependency_names.sort

data/lib/pod_builder/rome/post_install.rb

@@ -3,6 +3,7 @@
 require 'fourflusher'
 require 'colored'
 require 'pathname'
+require 'ruby-progressbar'
 
 module PodBuilder
   def self.build_for_iosish_platform_framework(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
@@ -20,7 +21,7 @@ module PodBuilder
     excluded_archs = ["i386"] # Fixes https://github.com/Subito-it/PodBuilder/issues/17
     excluded_archs += build_for_apple_silicon ? [] : ["arm64"]
     xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs, {})
-
+    
     spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
     spec_names.each do |root_name, module_name|
       device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
@@ -66,45 +67,47 @@ module PodBuilder
       FileUtils.rm_rf(simulator_framework_lib)
     end
   end
-
+  
   def self.build_for_iosish_platform_lib(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon, prebuilt_root_paths)
     raise "\n\nApple silicon hardware still unsupported since it requires to migrate to xcframeworks".red if build_for_apple_silicon
-        
+    
     deployment_target = target.platform_deployment_target
     target_label = target.cocoapods_target_label
-
+    
     spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
-
+    
     xcodebuild(sandbox, target_label, device, deployment_target, configuration, deterministic_build, [], prebuilt_root_paths)
     excluded_archs = build_for_apple_silicon ? [] : ["arm64"]
     xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs, prebuilt_root_paths)
-
+    
     spec_names.each do |root_name, module_name|
       simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
-      simulator_lib = "#{simulator_base}/lib#{module_name}.a"
-
+      simulator_lib = "#{simulator_base}/lib#{root_name}.a"
+      
       device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
       device_lib = "#{device_base}/lib#{root_name}.a"
-  
-      if File.file?(device_lib) && File.file?(simulator_lib)
-        # Starting with Xcode 12b3 the simulator binary contains an arm64 slice as well which conflict with the one in the device_lib
-        # when creating the fat library. A naive workaround is to remove the arm64 from the simulator_lib however this is wrong because 
-        # we might actually need to have 2 separated arm64 slices, one for simulator and one for device each built with different
-        # compile time directives (e.g #if targetEnvironment(simulator))
-        #
-        # For the time being we remove the arm64 slice bacause otherwise the `xcrun lipo -create -output ...` would fail.
-        if `xcrun lipo -info #{simulator_lib}`.include?("arm64")
-          `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}")
+      
+      unless File.file?(device_lib) && File.file?(simulator_lib)
+        next
       end
-
+      
+      # Starting with Xcode 12b3 the simulator binary contains an arm64 slice as well which conflict with the one in the device_lib
+      # when creating the fat library. A naive workaround is to remove the arm64 from the simulator_lib however this is wrong because 
+      # we might actually need to have 2 separated arm64 slices, one for simulator and one for device each built with different
+      # compile time directives (e.g #if targetEnvironment(simulator))
+      #
+      # For the time being we remove the arm64 slice bacause otherwise the `xcrun lipo -create -output ...` would fail.
+      if `xcrun lipo -info #{simulator_lib}`.include?("arm64")
+        `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}")
+      
       device_headers = Dir.glob("#{device_base}/**/*.h")
       simulator_headers = Dir.glob("#{simulator_base}/**/*.h")
       device_headers.each do |device_path|
         simulator_path = device_path.gsub(device_base, simulator_base)
-
+        
         merge_header_into(device_path, simulator_path)
       end 
       simulator_only_headers = simulator_headers - device_headers.map { |t| t.gsub(device_base, simulator_base) }
@@ -115,12 +118,12 @@ module PodBuilder
         FileUtils.mkdir_p(destination_folder)
         FileUtils.cp(path, destination_folder)
       end
-
+      
       swiftmodule_path = "#{simulator_base}/#{root_name}.swiftmodule"
       if File.directory?(swiftmodule_path)
         FileUtils.cp_r("#{swiftmodule_path}/.", "#{device_base}/#{root_name}.swiftmodule")
       end
-
+      
       if File.exist?("#{device_base}/#{root_name}.swiftmodule")
         # This is a swift pod with a swiftmodule in the root of the prebuilt folder
       else
@@ -130,7 +133,7 @@ module PodBuilder
         if public_headers_path.downcase != module_public_headers_path.downcase && File.directory?(public_headers_path) && File.directory?(module_public_headers_path)
           # For pods with module_name != name we have to move the modulemap files to the root_name one
           module_public_headers_path = "#{Configuration.build_path}/Pods/Headers/Public/#{module_name}"  
-          FileUtils.cp_r("#{module_public_headers_path}/.", public_headers_path)
+          FileUtils.cp_r("#{module_public_headers_path}/.", public_headers_path, :remove_destination => true)
         end
         Dir.glob("#{public_headers_path}/**/*.*").each do |path|
           destination_folder = "#{device_base}/Headers" + path.gsub(public_headers_path, "")
@@ -139,11 +142,11 @@ module PodBuilder
           FileUtils.cp(path, destination_folder)
         end          
       end
-
+      
       destination_path = "#{build_dir}/#{root_name}"
       if Dir.glob("#{device_base}/**/*.{a,framework,h}").count > 0
         FileUtils.mv(device_base, destination_path)
-
+        
         module_maps = Dir.glob("#{destination_path}/**/*.modulemap")
         module_map_device_base = device_base.gsub(/^\/private/, "") + "/"
         module_maps.each do |module_map|
@@ -154,7 +157,7 @@ module PodBuilder
       end
     end
   end
-
+  
   def self.merge_header_into(device_file, simulator_file)
     unless File.exist?(device_file) || File.exist?(simulator_file)
       return
@@ -163,33 +166,33 @@ module PodBuilder
     device_content = File.file?(device_file) ? File.read(device_file) : ""
     simulator_content = File.file?(simulator_file) ? File.read(simulator_file) : ""
     merged_content = %{
-#if TARGET_OS_SIMULATOR
-// ->
-
-#{simulator_content}
-
-// ->
-#else
-// ->
-
-#{device_content}
-
-// ->
-#endif
+      #if TARGET_OS_SIMULATOR
+      // ->
+      
+      #{simulator_content}
+      
+      // ->
+      #else
+      // ->
+      
+      #{device_content}
+      
+      // ->
+      #endif
     }        
     File.write(device_file, merged_content)
   end 
-
+  
   def self.add_simulator_conditional(path)
     file_content = File.read(path)
     content = %{
-#if TARGET_OS_SIMULATOR
-#{file_content}
-#endif
+      #if TARGET_OS_SIMULATOR
+      #{file_content}
+      #endif
     }        
     File.write(path, content)
   end
-
+  
   def self.xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, configuration, deterministic_build, exclude_archs, prebuilt_root_paths)
     args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{configuration} -sdk #{sdk})
     supported_platforms = { 'iphonesimulator' => 'iOS', 'appletvsimulator' => 'tvOS', 'watchsimulator' => 'watchOS' }
@@ -267,13 +270,27 @@ module PodBuilder
 end
 
 Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_context, user_options|
+  build_items_count = installer_context.umbrella_targets.map(&:specs).flatten.count
+  progressbar = ProgressBar.create(:length => 80, 
+                                   :total => build_items_count,
+                                   :title => "Building",
+                                   :format => "%t |%b>%i| %c/%C done".yellow)
+
+  progressbar_thread = Thread.new { 
+    loop do
+      built_pods = Dir.glob("#{PodBuilder::Configuration.build_path}/build/Release*/*").count
+      progressbar.progress = [0, built_pods - 1].max
+      sleep(5)
+    end
+  }
+  
   enable_dsym = user_options.fetch('dsym', true)
   configuration = user_options.fetch('configuration', 'Debug')
   uses_frameworks = user_options.fetch('uses_frameworks', true)
   if user_options["pre_compile"]
     user_options["pre_compile"].call(installer_context)
   end
-
+  
   prebuilt_root_paths = JSON.parse(user_options["prebuilt_root_paths"].gsub('=>', ':'))
   
   sandbox_root = Pathname(installer_context.sandbox_root)
@@ -297,72 +314,77 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
     when [:tvos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon, prebuilt_root_paths)
     when [:watchos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon, prebuilt_root_paths)
     else raise "\n\nUnknown platform '#{target.platform_name}'".red end
-    end  
+  end  
 
-    raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
+  progressbar.finish
+  progressbar_thread.exit
     
-    specs = installer_context.umbrella_targets.map { |t| t.specs.map(&:name) }.flatten.map { |t| t.split("/").first }.uniq
-    built_count = Dir["#{build_dir}/*"].select { |t| specs.include?(File.basename(t)) }.count
-    Pod::UI.puts "Built #{built_count} #{'items'.pluralize(built_count)}, copying..."
-    
-    base_destination.rmtree if base_destination.directory?
-    
-    installer_context.umbrella_targets.each do |umbrella|
-      umbrella.specs.each do |spec|
-        root_name = spec.name.split("/").first
-
-        if uses_frameworks
-          destination = File.join(base_destination, root_name)        
-        else
-          destination = File.join(base_destination, root_name, root_name)        
-        end
-        # Make sure the device target overwrites anything in the simulator build, otherwise iTunesConnect
-        # can get upset about Info.plist containing references to the simulator SDK
-        files = Pathname.glob("build/#{root_name}/*").reject { |f| f.to_s =~ /Pods[^.]+\.framework/ }
-
-        consumer = spec.consumer(umbrella.platform_name)
-        file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(spec.root.name), consumer)
-        files += file_accessor.vendored_libraries
-        files += file_accessor.vendored_frameworks
-        files += file_accessor.resources
-
-        FileUtils.mkdir_p(destination)        
-        files.each do |file|
-          FileUtils.cp_r(file, destination)
-        end    
-      end
-    end
+  raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
+  
+  specs = installer_context.umbrella_targets.map { |t| t.specs.map(&:name) }.flatten.map { |t| t.split("/").first }.uniq
+  built_count = Dir["#{build_dir}/*"].select { |t| specs.include?(File.basename(t)) }.count
+  Pod::UI.puts "Built #{built_count} #{'items'.pluralize(built_count)}, copying..."
+  
+  base_destination.rmtree if base_destination.directory?
     
-    # Depending on the resource it may happen that it is present twice, both in the .framework and in the parent folder
-    Dir.glob("#{base_destination}/*") do |path|
-      unless File.directory?(path)
-        return
+  installer_context.umbrella_targets.each do |umbrella|
+    umbrella.specs.each do |spec|
+      root_name = spec.name.split("/").first
+      
+      if uses_frameworks
+        destination = File.join(base_destination, root_name)        
+      else
+        destination = File.join(base_destination, root_name, root_name)        
       end
+      # Make sure the device target overwrites anything in the simulator build, otherwise iTunesConnect
+      # can get upset about Info.plist containing references to the simulator SDK
+      files = Pathname.glob("build/#{root_name}/*").reject { |f| f.to_s =~ /Pods[^.]+\.framework/ }
       
-      files = Dir.glob("#{path}/*")
-      framework_files = Dir.glob("#{path}/*.framework/**/*").map { |t| File.basename(t) }
+      consumer = spec.consumer(umbrella.platform_name)
+      file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(spec.root.name), consumer)
+      files += file_accessor.vendored_libraries
+      files += file_accessor.vendored_frameworks
+      begin
+        files += file_accessor.resources
+      rescue
+      end
       
+      FileUtils.mkdir_p(destination)        
       files.each do |file|
-        filename = File.basename(file.gsub(/\.xib$/, ".nib"))
-        if framework_files.include?(filename)
-          FileUtils.rm_rf(file)
-        end
-      end
+        FileUtils.cp_r(file, destination)
+      end    
     end
-    
-    if enable_dsym
-      dsym_source = "#{build_dir}/dSYM"
-      if File.directory?(dsym_source)
-        FileUtils.mv(dsym_source, sandbox_root.parent)
-      end
-    else
-      raise "Not implemented"
+  end
+  
+  # Depending on the resource it may happen that it is present twice, both in the .framework and in the parent folder
+  Dir.glob("#{base_destination}/*") do |path|
+    unless File.directory?(path)
+      return
     end
     
-    build_dir.rmtree if build_dir.directory?
+    files = Dir.glob("#{path}/*")
+    framework_files = Dir.glob("#{path}/*.framework/**/*").map { |t| File.basename(t) }
     
-    if user_options["post_compile"]
-      user_options["post_compile"].call(installer_context)
+    files.each do |file|
+      filename = File.basename(file.gsub(/\.xib$/, ".nib"))
+      if framework_files.include?(filename)
+        FileUtils.rm_rf(file)
+      end
     end
   end
-  
+  
+  if enable_dsym
+    dsym_source = "#{build_dir}/dSYM"
+    if File.directory?(dsym_source)
+      FileUtils.mv(dsym_source, sandbox_root.parent)
+    end
+  else
+    raise "Not implemented"
+  end
+  
+  build_dir.rmtree if build_dir.directory?
+    
+  if user_options["post_compile"]
+    user_options["post_compile"].call(installer_context)
+  end
+end

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0.beta.32"
+  VERSION = "2.0.0.beta.37"
 end
   

data/pod-builder.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'cocoapods-core', '~> 1.6'
   spec.add_runtime_dependency 'CFPropertyList'
   spec.add_runtime_dependency 'json'
+  spec.add_runtime_dependency 'ruby-progressbar', '~> 1.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.32
+  version: 2.0.0.beta.37
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 description: Prebuild CocoaPods pods to make compiling your Xcode projects faster
 email:
 - tomas.camin@adevinta.com