Merge pull request #4490 from aeddi/fix/mobile-build

js/ios/Podfile

@@ -59,6 +59,11 @@ use_react_native!(
           config.build_settings['SWIFT_VERSION'] = '5.0'
         end
       end
+      if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+        target.build_configurations.each do |config|
+          config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+        end
+      end
     end
   end
 end

js/ios/berty.yaml

@@ -203,7 +203,7 @@ targets:
     postBuildScripts:
     - name: Bundle React Native code and images
       script: |
-        export NODE_BINARY=node
+        export NODE_BINARY="$(zsh -ilc 'asdf which node' 2> /dev/null || echo node)"
         export ENTRY_FILE=index.ts
         ../node_modules/react-native/scripts/react-native-xcode.sh
 

js/patches/expo-constants+13.0.2.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/expo-constants/ios/EXConstants.podspec b/node_modules/expo-constants/ios/EXConstants.podspec
+index c45ac48..cdeee4c 100644
+--- a/node_modules/expo-constants/ios/EXConstants.podspec
++++ b/node_modules/expo-constants/ios/EXConstants.podspec
+@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
+
+   s.script_phase = {
+     :name => 'Generate app.config for prebuilt Constants.manifest',
+-    :script => 'bash -l -c "$PODS_TARGET_SRCROOT/../scripts/get-app-config-ios.sh"',
++    :script => "export NODE_BINARY=\"$(zsh -ilc 'asdf which node' 2> /dev/null || echo '')\"\nbash -l -c \"$PODS_TARGET_SRCROOT/../scripts/get-app-config-ios.sh\"",
+     :execution_position => :before_compile
+   }
+

js/patches/react-native+0.64.2.patch → js/patches/react-native+0.64.4.patch

@@ -11,7 +11,7 @@ index dd34c98..f406bbe 100644
 
          packageTask.dependsOn(currentAssetsCopyTask)
 diff --git a/node_modules/react-native/scripts/react_native_pods.rb b/node_modules/react-native/scripts/react_native_pods.rb
-index db9a34a..86d02ac 100644
+index db9a34a..8c125ff 100644
 --- a/node_modules/react-native/scripts/react_native_pods.rb
 +++ b/node_modules/react-native/scripts/react_native_pods.rb
 @@ -165,7 +165,9 @@ def use_react_native_codegen!(spec, options={})
@@ -30,7 +30,7 @@ index db9a34a..86d02ac 100644
      :input_files => [srcs_dir],
      :output_files => ["$(DERIVED_FILE_DIR)/codegen-#{codegen_modules_library_name}.log"].concat(generated_files),
 -    :script => "set -o pipefail\n\nbash -l -c '#{env_vars} CODEGEN_MODULES_LIBRARY_NAME=#{codegen_modules_library_name} #{File.join(__dir__, "generate-specs.sh")}' 2>&1 | tee \"${SCRIPT_OUTPUT_FILE_0}\"",
-+    :script => "set -o pipefail\n\nbash -l -c '#{env_vars} CODEGEN_MODULES_LIBRARY_NAME=#{codegen_modules_library_name} ../../node_modules/react-native/scripts/generate-specs.sh' 2>&1 | tee \"${SCRIPT_OUTPUT_FILE_0}\"",
++    :script => "set -o pipefail\nexport NODE_BINARY=\"$(zsh -ilc 'asdf which node' 2> /dev/null || echo '')\"\nbash -l -c '#{env_vars} CODEGEN_MODULES_LIBRARY_NAME=#{codegen_modules_library_name} ../../node_modules/react-native/scripts/generate-specs.sh' 2>&1 | tee \"${SCRIPT_OUTPUT_FILE_0}\"",
      :execution_position => :before_compile,
      :show_env_vars_in_log => true
    }