pod-builder 2.0.0.beta.33 → 2.0.0.beta.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b58e2c327114bf83714658e6dd24e5a54ab583f42f81b41c193e83b1c4b8b0f2
-  data.tar.gz: fc32c5dc1aa63ad240116a0da78bfb10a9acdfb39e192d075b979dbe0828d690
+  metadata.gz: 31aa509b926c753841f3739996fad1be623bac4ceee8ae30ae9b1ee254f2ddb3
+  data.tar.gz: 56df221c8e00be54c33cfa491629d0d13a22087108d8722a8bf925cbd85e959e
 SHA512:
-  metadata.gz: 23eb28db1f01119fed69b0a11039049fffe6e74acef44871a61cf7745972ed52d49435febf4ee35647517d001f6292b13b766fc0c18392ae71d4877d8b95ed1a
-  data.tar.gz: ce587f760d65fcb04778838fb200f6f018fa8cdfb39ae33eee7f67de4d82ad761fae340abc65beaf92a6d03fdd594deba2819771d461c203b25e2c2e7986b470
+  metadata.gz: 3b55c31c20f5e676ff8c004d233449cbd57acac51d2fb7925340e7e25c949e9c72743ba2683255b34e5ea72bf13da5394b39f2cd0383fa95d82f9ebbb263c948
+  data.tar.gz: 05e76c637a0dcb3856698ce8f144e9ca734e4463edfe19ed9677c87dee7447b473da3e0918fb7c0c79f78b90604938ebe7d2b22ba1826f74377fb808ba77818e

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("-a", "--auto-resolve-deps", "Include all pods that depend on the specified <PODNAME...>") do |o|
+          OPTIONS[:auto_resolve_dependencies] = o
+        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

@@ -72,6 +72,10 @@ module PodBuilder
         podfiles_items = [pods_to_build_debug] + [pods_to_build_release]
 
         install_using_frameworks = Podfile::install_using_frameworks(analyzer)
+
+        unless install_using_frameworks
+          prepare_defines_modules_override(all_buildable_items)
+        end
         
         install_result = InstallResult.new
         podfiles_items.reject { |x| x.empty? }.each do |podfile_items|
@@ -118,6 +122,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?("/")
@@ -187,7 +199,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[:auto_resolve_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/configuration.rb

@@ -18,32 +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": {
+      "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

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
         
@@ -244,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"
@@ -406,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)
@@ -503,8 +494,10 @@ module PodBuilder
       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)
-  
-        data["SchemeUserState"]["Pods-DummyTarget.xcscheme"]["isShown"] = true
+
+        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)  

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

@@ -81,24 +81,26 @@ module PodBuilder
 
     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")
@@ -130,7 +132,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, "")

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0.beta.33"
+  VERSION = "2.0.0.beta.34"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.33
+  version: 2.0.0.beta.34
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler