pod-builder 2.0.0.beta.35 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 037b4a3f456716c55d38e1ec98307ff27e87b97c908dd5e80e5895e9686f6e3f
-  data.tar.gz: 82dbc45cb9220beb68fe1b76c26ac11f6f8d45927e35fa73ecdd754609742830
+  metadata.gz: 75ae604ccd8e9725dda21d10a5ef0c590ae862e4a099474dfe4c799c92ccba47
+  data.tar.gz: a040c4aca25a30495d6f20f35c2de28c7d95cde27c85403f9ab64bab6e30419b
 SHA512:
-  metadata.gz: d067c51f54eea74198b8d9ae7a85a25d271666ca3301836ab14920f52c5d9dc47aae4dfafea4de43953c09b5d15cbede4f7bcd0841772c55e7a6f057e61a737b
-  data.tar.gz: 504fd2e0adec760b4a58d26bec752b3dcf7755b425a0b109662e8cc4e852387b21d003c6d2abbe87e3d92d40412c9d544eb2c2bc65f41ae9e9a94a5e1eec58c3
+  metadata.gz: 45207cae794c65336e5c67654b5a1fcc787b9a2c6cb861e67d5645f00769c53bc2d0d8e7ae930e53ae00e0fa3558dc95969e080a61341a5101d737dc93749ba3
+  data.tar.gz: 3ea8460b857509577001fb25bf1e8721f28de773988c8dbbbd445e72c9006c430e20f4476fc25e6a1a712f27eaf16b4d5625c9271530684a96678b122ef8a554

data/README.md

@@ -130,7 +130,7 @@ This command will generate a custom lldinit file which will be stored in the _Po
 
 The most convenient place to update the lldbinit file is in your Podfile pre_install or post_install actions. It is suggested to add the following lines
 
-````
+```
     pid = spawn("pod_builder generate_lldbinit")
     Process.detach(pid)
 ```

data/lib/pod_builder/command/build.rb

@@ -72,11 +72,15 @@ module PodBuilder
         podfiles_items = [pods_to_build_debug] + [pods_to_build_release]
 
         install_using_frameworks = Podfile::install_using_frameworks(analyzer)
-
-        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 if Configuration.react_native_project
-        else
+        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

data/lib/pod_builder/command/init.rb

@@ -38,6 +38,7 @@ module PodBuilder
 
         if podfile_content.include?("/node_modules/react-native/")
           podfile_content = Podfile.prepare_for_react_native(podfile_content)
+          update_react_native_podspecs()
         end
 
         File.write(prebuilt_podfile_path, podfile_content)
@@ -116,6 +117,32 @@ module PodBuilder
       def self.trim_gemfile_line(line)
         return line.gsub("\"", "'").gsub(" ", "")
       end
+
+      def self.update_react_native_podspecs
+        # 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
+
+        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)
+
+        content.sub!(expected_header_search_path_prefix, "#{expected_header_search_path_prefix}\\\"$(PODS_ROOT)/Headers/Public/Flipper-Folly\\\" ")
+        File.write(paths[0], content)        
+
+        # 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
+
+        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)
+
+        content.sub!(expected_header_search_path_prefix, "#{expected_header_search_path_prefix}\\\"$(PODS_ROOT)/Headers/Public/Flipper-Folly\\\" ")
+        File.write(paths[0], content)
+      end
     end
   end
 end

data/lib/pod_builder/configuration.rb

@@ -39,7 +39,8 @@ module PodBuilder
         "ENABLE_BITCODE": "NO"
       }
     }.freeze
-    DEFAULT_SKIP_PODS = ["GoogleMaps"]
+    DEFAULT_SKIP_PODS = ["GoogleMaps", "React-RCTFabric", "React-Core", "React-CoreModules"] # Not including React-RCTNetwork might loose some debug warnings
+
     DEFAULT_FORCE_PREBUILD_PODS = []
     DEFAULT_BUILD_SYSTEM = "Latest".freeze # either Latest (New build system) or Legacy (Standard build system)
     DEFAULT_LIBRARY_EVOLUTION_SUPPORT = false

data/lib/pod_builder/install.rb

@@ -256,11 +256,7 @@ module PodBuilder
       return data["PreferenceSpecifiers"] || []
     end
     
-    def self.copy_development_pods_source_code(podfile_content, podfile_items)
-      if Configuration.build_using_repo_paths
-        return podfile_content
-      end
-      
+    def self.copy_development_pods_source_code(podfile_content, podfile_items)      
       # Development pods are normally built/integrated without moving files from their original paths.
       # It is important that CocoaPods compiles the files under Configuration.build_path in order that 
       # DWARF debug info reference to this constant path. Doing otherwise breaks the assumptions that 
@@ -276,7 +272,9 @@ module PodBuilder
           FileUtils.cp_r("#{PodBuilder::basepath(podfile_item.path)}/.", destination_path)
         end
         
-        podfile_content.gsub!("'#{podfile_item.path}'", "'#{destination_path}'")
+        unless Configuration.build_using_repo_paths
+          podfile_content.gsub!("'#{podfile_item.path}'", "'#{destination_path}'")
+        end
       end
       
       return podfile_content

data/lib/pod_builder/podfile.rb

@@ -394,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 root level (not nested in targets) in #{PodBuilder::basepath("Podfile")}".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

@@ -154,7 +154,7 @@ module PodBuilder
         @tag = checkout_options[opts_key][:tag]
         @commit = checkout_options[opts_key][:commit]
         @path = checkout_options[opts_key][:path]
-        @podspec_path = checkout_options[opts_key][:podspec]
+        @podspec_path = checkout_options[opts_key][:podspec]        
         @branch = checkout_options[opts_key][:branch]
         @is_external = true
       else
@@ -213,6 +213,12 @@ module PodBuilder
       @is_static = spec.root.attributes_hash["static_framework"] || false
       @xcconfig = spec.root.attributes_hash["xcconfig"] || {}
 
+      if spec.attributes_hash.has_key?("script_phases")
+        Configuration.skip_pods += [name, root_name]
+        Configuration.skip_pods.uniq!
+        puts "Will skip '#{root_name}' which defines script_phase in podspec".blue
+      end
+
       default_subspecs_specs ||= begin
         subspecs = all_specs.select { |t| t.name.split("/").first == @root_name }
         subspecs.select { |t| @default_subspecs.include?(t.name.split("/").last) }

data/lib/pod_builder/podspec.rb

@@ -99,6 +99,7 @@ module PodBuilder
         end
         if !item.header_dir.nil? && !install_using_frameworks
           podspec += "#{indentation}#{spec_var}.header_dir = '#{item.header_dir}'\n"
+          podspec += "#{indentation}#{spec_var}.header_mappings_dir = '#{item.root_name}/Headers/#{item.header_dir}'\n"
         end
 
         if item.xcconfig.keys.count > 0

data/lib/pod_builder/rome/post_install.rb

@@ -1,5 +1,3 @@
-# TODO: Add support when building without use_frameworks!
-
 require 'fourflusher'
 require 'colored'
 require 'pathname'
@@ -20,7 +18,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,30 +64,30 @@ 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#{root_name}.a"
-
+      
       device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
       device_lib = "#{device_base}/lib#{root_name}.a"
-  
+      
       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
@@ -101,12 +99,12 @@ module PodBuilder
       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) }
@@ -117,12 +115,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
@@ -141,11 +139,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|
@@ -156,7 +154,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
@@ -165,33 +163,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' }
@@ -268,16 +266,14 @@ module PodBuilder
   end
 end
 
-Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_context, user_options|
-  puts "Building".yellow
-
+Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_context, user_options|  
   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)
@@ -301,75 +297,71 @@ 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  
-
-    raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
+  end  
     
-    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
-        begin
-          files += file_accessor.resources
-        rescue
-        end
-
-        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
+      files += file_accessor.resources
       
+      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.35"
+  VERSION = "2.0.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.35
+  version: 2.0.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -229,9 +229,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: