pod-builder 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b61237b9ba9ce8a64c815e9802ded560720e61fd602cbcba5a0e527350940c
-  data.tar.gz: 738482aa4ba2c93fd51f7461b3fdbd12527877249eb9f5f3537fbc4f32a5a12b
+  metadata.gz: f7a2abe8fcb659b07c1a6819579093c791eca94d882888098e65c75c7ea9b260
+  data.tar.gz: f709a74f3bceee3acc9e57817706165c32693fbdc32b777b403c2257f9712889
 SHA512:
-  metadata.gz: 92de40ca5a513bf4c7d4f9cbdd36f3fe4550bef9ee400473f567377c2f9f7041f90afddf98cad2c7aabe64e62eb95ba953024a1c7c93f09f5d965e4adb6f173e
-  data.tar.gz: 4470fbee9ac31820c71a8892a027151474dc358b9c5a5b02ca25ac8def663ddc248284c6281b6271b83e40f42256f0648bc100ebb4153ca5a14a4530579e808a
+  metadata.gz: cc2172d216372bf012494106b70f93a6aaee0001e493a890067b7206020cb4340015766575f90b5e91ef736e1884dc16f93cd22749ae0cb6e82dce51a8d4fb53
+  data.tar.gz: baea42573bb858669fb0e91b1fc798301e88fee53808baab62247e89e89bdd068f2d11c65d8a5f8f6a64fbd029649fb9c6e93661618ea911851165d4155f0d66

data/lib/pod_builder/command/init.rb

@@ -65,6 +65,10 @@ module PodBuilder
                        source_path_rel_path,
                        development_pods_config_rel_path]
         
+        if Configuration.react_native_project
+          git_ignores.push("build/")
+        end
+        
         File.write("#{OPTIONS[:prebuild_path]}/.gitignore", git_ignores.join("\n"))
       end
 
@@ -141,7 +145,7 @@ module PodBuilder
         expected_header_search_path_prefix = "\"HEADER_SEARCH_PATHS\" => \""
         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\\\" ")
+        content.sub!(expected_header_search_path_prefix, "#{expected_header_search_path_prefix}\\\"$(PODS_ROOT)/Headers/Public/Flipper-Folly\\\" \\\"$(PODS_ROOT)/../build/generated/ios\\\" ")
         File.write(paths[0], content)
       end
     end

data/lib/pod_builder/core.rb

@@ -176,6 +176,9 @@ module PodBuilder
     end
 
     PodBuilder::safe_rm_rf(basepath("Pods"))
+    if Configuration.react_native_project
+      PodBuilder::safe_rm_rf(basepath("build"))
+    end
   end
 
   def self.system_swift_version

data/lib/pod_builder/install.rb

@@ -198,8 +198,6 @@ module PodBuilder
       gitignored_files = PodBuilder::gitignoredfiles
       
       swift_version = PodBuilder::system_swift_version
-
-      write_prebuilt_info_filename_gitattributes
       
       ret = Hash.new
       root_names = podfile_items.reject(&:is_prebuilt).map(&:root_name).uniq
@@ -441,14 +439,6 @@ module PodBuilder
         FileUtils.cp_r(PodBuilder::buildpath_dsympath, PodBuilder::basepath)
       end
     end
-
-    def self.write_prebuilt_info_filename_gitattributes
-      gitattributes_path = PodBuilder::basepath(".gitattributes")
-      expected_attributes = ["#{Configuration.configuration_filename} binary"].join
-      unless File.exists?(gitattributes_path) && File.read(gitattributes_path).include?(expected_attributes)
-        File.write(gitattributes_path, expected_attributes, mode: 'a')
-      end
-    end
         
     def self.build_folder_hash_in_prebuilt_info_file(podfile_item)
       prebuilt_info_path = PodBuilder::prebuiltpath(File.join(podfile_item.root_name, Configuration.prebuilt_info_filename))

data/lib/pod_builder/podfile.rb

@@ -727,6 +727,15 @@ module PodBuilder
 
     def self.prepare_react_native_compilation_workarounds(podfile_content)
       return  podfile_content + """
+
+def prepare_rn_react_codegen
+  # Beginning with version 0.68.0 react native project compilation relies on some autogenerated files
+  # that are added to the React-Codegen target
+  source_path = \"#{PodBuilder::project_path}/build/generated/ios/.\"
+  destination_path = \"#{PodBuilder::basepath}/build/generated/ios\"
+  FileUtils.cp_r(source_path, destination_path)
+end
+
 def prepare_rn_compilation_libevent
   path = \"Pods/libevent/include/event.h\"
   replace(path, \"#include <evutil.h>\", \"// #include <evutil.h>\")
@@ -745,11 +754,46 @@ def replace(path, find, replace)
     content = File.read(path).gsub(find, replace)
     File.write(path, content)
   end
-end      
+end  
+
+pre_install do |installer|
+  require 'json'
+
+  pods_path = \"#{PodBuilder::project_path}/Pods\"
+  j = JSON.parse(File.read(\"\#{pods_path}/Local Podspecs/FBReactNativeSpec.podspec.json\"))  
+  
+  output_files = j.dig(\"script_phases\", \"output_files\")
+
+  script_lines = j.dig(\"script_phases\", \"script\").split(\"\\n\")
+  script_lines.insert(0, \"export SCRIPT_OUTPUT_FILE_0=\\\"\#{output_files[0]}\\\"\")
+  script_lines.insert(0, \"export DERIVED_FILE_DIR=/tmp\")
+  script_lines.insert(0, \"export PODS_TARGET_SRCROOT=\\\"#{PodBuilder::project_path}/../node_modules/react-native/React/FBReactNativeSpec\\\"\")
+  script_lines.insert(0, \"export PODS_ROOT=\\\"\#{pods_path}\\\"\")
+  
+  Dir.chdir(pods_path) do
+    cmd = script_lines.reject(&:blank?).join(\";\\n\")
+    system(cmd)
+  end
+end
 
 post_install do |installer|
   prepare_rn_compilation_libevent()
   prepare_rn_flipper_module_redefinition()
+  prepare_rn_react_codegen()
+
+  installer.pods_project.targets.each do |target|
+      target.build_configurations.each do |config|
+          if target.name == 'React-Codegen'
+            config.build_settings['HEADER_SEARCH_PATHS'] = config.build_settings.fetch('HEADER_SEARCH_PATHS', []) + ['$(inherited)', '${PODS_ROOT}/Flipper-Folly', '${PODS_ROOT}/React-Core/ReactCommon', '$(PODS_ROOT)/React-Core/ReactCommon/react/renderer/graphics/platform/cxx', '$(PODS_ROOT)/React-Codegen/build/generated/ios']
+          end
+          if target.name == 'React-Core'
+            config.build_settings['HEADER_SEARCH_PATHS'] = config.build_settings.fetch('HEADER_SEARCH_PATHS', []) + ['$(inherited)', '${PODS_ROOT}/Flipper-Folly']
+          end
+          if target.name == 'React-CoreModules'
+            config.build_settings['HEADER_SEARCH_PATHS'] = config.build_settings.fetch('HEADER_SEARCH_PATHS', []) + ['$(inherited)', '${PODS_ROOT}/Flipper-Folly', '$(PODS_ROOT)/../build/generated/ios']
+          end
+      end
+  end
 end
       """
     end

data/lib/pod_builder/version.rb

@@ -1,3 +1,3 @@
 module PodBuilder
-  VERSION = "4.4.1"
+  VERSION = "4.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Tomas Camin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler