[REF] revert upgrade to 0.72.x changes

bitpay · May 17, 2023 · 6e45584 · 6e45584
1 parent a3d8d3e
commit 6e45584
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 1,989 deletions.
diff --git a/.node-version b/.node-version
@@ -0,0 +1 @@
+18
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.7.6
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -25,7 +25,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.182.0
+FLIPPER_VERSION=0.125.0
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -7,4 +7,4 @@ include ':react-native-haptic-feedback'
 project(':react-native-haptic-feedback').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-haptic-feedback/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
-includeBuild('../node_modules/@react-native/gradle-plugin')
+includeBuild('../node_modules/react-native-gradle-plugin')
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,13 +1,6 @@
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-# Resolve react_native_pods.rb with node to allow for hoisting
-require Pod::Executable.execute_command('node', ['-p',
-  'require.resolve(
-    "react-native/scripts/react_native_pods.rb",
-    {paths: [process.argv[1]]},
-  )', __dir__]).strip
-
 platform :ios, min_ios_version_supported
 prepare_react_native_project!
 
@@ -61,12 +54,10 @@ target 'BitPayApp' do
   end
 
   post_install do |installer|
-    # https://github.com/facebook/react-native/blob/main/scripts/react_native_pods.rb#L197-L202
     react_native_post_install(
       installer,
       # Set `mac_catalyst_enabled` to `true` in order to apply patches
       # necessary for Mac Catalyst builds
-      config[:reactNativePath],
       :mac_catalyst_enabled => false
     )
     __apply_Xcode_12_5_M1_post_install_workaround(installer)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1316,9 +1316,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Appboy-iOS-SDK: 2fc5b290fe1caa85718b811a19b303d45caea975
   AppsFlyerFramework: 9f304d91cc80b6579b1206a59220383056b58b47
-  boost: a7c83b31436843459a1961bfd74b96033dc77234
+  boost: 57d2868c099736d80fcd648bf211b4431e51a558
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
+  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: f637f31eacba90d4fdeff3fa41608b8f361c173b
   FBReactNativeSpec: 7fd4b5d618f41d5a75f79f0a85403d0fab3a3f80
   Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
@@ -1331,7 +1331,7 @@ SPEC CHECKSUMS:
   Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
   FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
+  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de
   InputMask: 71d291dc54d2deaeac6512afb6ec2304228c0bb7
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
@@ -1418,6 +1418,6 @@ SPEC CHECKSUMS:
   Yoga: 065f0b74dba4832d6e328238de46eb72c5de9556
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 842874ccc550fe50fa7d56aa90032fb43032ac68
+PODFILE CHECKSUM: fe2ed3756c1d0a13e122332e57fd8bb6d6538bab
 
 COCOAPODS: 1.12.1
diff --git a/package.json b/package.json
@@ -242,6 +242,7 @@
     "crypto": "react-native-crypto",
     "http": "@tradle/react-native-http",
     "https": "https-browserify",
+    "os": "react-native-os",
     "path": "path-browserify",
     "fs": "react-native-level-fs",
     "_stream_transform": "readable-stream/transform",
@@ -250,13 +251,13 @@
     "_stream_duplex": "readable-stream/duplex",
     "_stream_passthrough": "readable-stream/passthrough",
     "stream": "stream-browserify",
-    "vm": "vm-browserify",
-    "os": "react-native-os"
+    "vm": "vm-browserify"
   },
   "browser": {
     "crypto": "react-native-crypto",
     "http": "@tradle/react-native-http",
     "https": "https-browserify",
+    "os": "react-native-os",
     "path": "path-browserify",
     "fs": "react-native-level-fs",
     "_stream_transform": "readable-stream/transform",
@@ -265,10 +266,6 @@
     "_stream_duplex": "readable-stream/duplex",
     "_stream_passthrough": "readable-stream/passthrough",
     "stream": "stream-browserify",
-    "vm": "vm-browserify",
-    "os": "react-native-os"
-  },
-  "engines": {
-    "node": ">=16"
+    "vm": "vm-browserify"
   }
 }