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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd2f1ce8ec492d776fb38d6a21bd80f2e612b22d1bd820440a0a5930d1bf70c6
-  data.tar.gz: 5e11315787531d4f8bd0d5975eddc0e2d2611aa21f594758b13ee51747fa570b
+  metadata.gz: 2b464e76791583a1bf1b8b993ebb7fd5084b818dd07a96d38844192928abc333
+  data.tar.gz: 1fd90be22ab09b7933748bd8d8ed7e1fd654fe5e1a0355b764af36d83684c37a
 SHA512:
-  metadata.gz: 7a91b2733fb7dde282bdc6e6fe45d270dd65fa971f24c39adca133683aad9b9adad5ae7d3ecc9978edff40346450852458cbc5df3ffc34c5bc16f451487c8819
-  data.tar.gz: 972cd2864b2384fdae50af8cc97ebb2ab5f0381630f5ca557a67b57d62ecb6956bc7f802bc738e7b50bb35cd52418e3f0211d17174ce8b2710bec7f6c501d339
+  metadata.gz: 95d6ed845f6d68446f57ec9eb72b4bf14c498dd9bb05465dc259ef3225f3585489b52ec4c874cd2f92a45689827859f68bb223ed755ef06b7524d9d04f70e4d6
+  data.tar.gz: 0cae9e9e1d06326abd71de3c8ce5df3740df01bcef47825b49f6446c1649297281c417a1afe50086da8e4270a8e0518e47563c9d0235a3ad1f20d7f5eaf14b9f

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/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/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

@@ -279,7 +279,7 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
   progressbar_thread = Thread.new { 
     loop do
       built_pods = Dir.glob("#{PodBuilder::Configuration.build_path}/build/Release*/*").count
-      progressbar.progress = [0, built_pods - 1].max
+      progressbar.progress = [[0, built_pods - 1].max, progressbar.total].min
       sleep(5)
     end
   }
@@ -344,10 +344,7 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
       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
+      files += file_accessor.resources
       
       FileUtils.mkdir_p(destination)        
       files.each do |file|

data/lib/pod_builder/version.rb

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

metadata

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