Skip to content

Commit

Permalink
RN 0.73.6 upgrade (#1264)
Browse files Browse the repository at this point in the history
Co-authored-by: An Nguyen <an.nguyen@avalabs.org>
Co-authored-by: JungHwan Jang <onghwan@gmail.com>
  • Loading branch information
3 people authored Apr 22, 2024
1 parent af981af commit 1644856
Showing 325 changed files with 9,512 additions and 9,727 deletions.
8 changes: 8 additions & 0 deletions bitrise.yml
Original file line number Diff line number Diff line change
@@ -21,8 +21,12 @@ app:
workflows:
_build-android:
steps:
- set-java-version@1:
inputs:
- set_java_version: "17"
- install-missing-android-tools@3:
inputs:
- ndk_version: 25.1.8937393
- gradlew_path: $ANDROID_PROJECT_LOCATION/gradlew
- restore-gradle-cache@1: {}
- android-build@1:
@@ -66,8 +70,12 @@ workflows:
opts:
is_expand: false
steps:
- set-java-version@1:
inputs:
- set_java_version: "17"
- install-missing-android-tools@3:
inputs:
- ndk_version: 25.1.8937393
- gradlew_path: $ANDROID_PROJECT_LOCATION/gradlew
- restore-gradle-cache@1: {}
- script-runner@0:
4 changes: 4 additions & 0 deletions docs/dependencies_resolutions.md
Original file line number Diff line number Diff line change
@@ -45,3 +45,7 @@ supports promise out of the box
### "@hpke/core": "1.2.7"

@avalabs/utils-sdk depends on @hpke/core 1.2.5 while core mobile depends on 1.2.7. we need to force it to 1.2.7 so that we can apply the same patch to @hpke/core.

### "@noble/secp256k1": "2.0.0"

before, we were using secp256k1 < 2.0.0 and to make it use react-native-quick-crypto, we had to patch it. we now force it to be 2.0.0 so we can remove the manual patch. secp256k1 is being used in multiple places: @avalabs/avalanchejs, @avalabs/core-mobile, ethereum-cryptography,...
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -25,16 +25,17 @@
"plist": "3.0.5",
"ansi-regex": "4.1.1",
"ansi-styles": "3.2.1",
"@types/react": "17.0.44",
"@types/react-dom": "18.0.6",
"@types/react": "18.2.6",
"@types/react-dom": "18.2.21",
"rxjs": "7.5.6",
"eslint": "8.50.0",
"eslint-config-prettier": "8.10.0",
"jest": "29.7.0",
"bip174": "2.1.0",
"ethers": "6.8.1",
"web3": "1.7.5",
"@hpke/core": "1.2.7"
"@hpke/core": "1.2.7",
"@noble/secp256k1": "2.0.0"
},
"engines": {
"node": ">=18.14.1",
5 changes: 4 additions & 1 deletion packages/core-mobile/.gitignore
Original file line number Diff line number Diff line change
@@ -76,4 +76,7 @@ e2e/tests/performance/testResults/
app/contracts/openzeppelin

# generated metro monorepo config
metro.monorepo.config.js
metro.monorepo.config.js

# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*
13 changes: 2 additions & 11 deletions packages/core-mobile/.storybook/storybook.requires.js
Original file line number Diff line number Diff line change
@@ -5,8 +5,7 @@ import {
addDecorator,
addParameters,
addArgsEnhancer,
clearDecorators,
} from "@storybook/react-native";
} from "@storybook/react-native/V6";

global.STORIES = [
{
@@ -22,19 +21,11 @@ import "@storybook/addon-ondevice-controls/register";
import "@storybook/addon-ondevice-actions/register";
import "@storybook/addon-ondevice-backgrounds/register";

import { argsEnhancers } from "@storybook/addon-actions/dist/modern/preset/addArgs";
import { argsEnhancers } from "@storybook/addon-actions/dist/preview";

import { decorators, parameters } from "./preview";

if (decorators) {
if (__DEV__) {
// stops the warning from showing on every HMR
require("react-native").LogBox.ignoreLogs([
"`clearDecorators` is deprecated and will be removed in Storybook 7.0",
]);
}
// workaround for global decorators getting infinitely applied on HMR, see https://github.com/storybookjs/react-native/issues/185
clearDecorators();
decorators.forEach((decorator) => addDecorator(decorator));
}

2 changes: 1 addition & 1 deletion packages/core-mobile/Gemfile
Original file line number Diff line number Diff line change
@@ -3,5 +3,5 @@ source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby '3.2.2'

gem 'cocoapods', '1.12.1'
gem 'cocoapods', '1.15.2'
gem 'activesupport', '7.0.8'
30 changes: 17 additions & 13 deletions packages/core-mobile/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.6)
CFPropertyList (3.0.7)
base64
nkf
rexml
activesupport (7.0.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
claide (1.1.0)
cocoapods (1.12.1)
cocoapods (1.15.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.12.1)
cocoapods-core (= 1.15.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.6.0, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -32,8 +35,8 @@ GEM
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.12.1)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.15.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
@@ -44,7 +47,7 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.6.3)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
@@ -57,27 +60,28 @@ GEM
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.1)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
json (2.6.3)
json (2.7.1)
minitest (5.20.0)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.2.6)
ruby-macho (2.5.1)
typhoeus (1.4.0)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.23.0)
xcodeproj (1.24.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
@@ -90,7 +94,7 @@ PLATFORMS

DEPENDENCIES
activesupport (= 7.0.8)
cocoapods (= 1.12.1)
cocoapods (= 1.15.2)

RUBY VERSION
ruby 3.2.2p53
11 changes: 11 additions & 0 deletions packages/core-mobile/__mocks__/react-native-bootsplash.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
jest.mock('react-native-bootsplash', () => {
return {
hide: jest.fn().mockResolvedValue(),
isVisible: jest.fn().mockResolvedValue(false),
useHideAnimation: jest.fn().mockReturnValue({
container: {},
logo: { source: 0 },
brand: { source: 0 }
})
}
})
55 changes: 0 additions & 55 deletions packages/core-mobile/android/app/BUCK

This file was deleted.

Loading

0 comments on commit 1644856

Please sign in to comment.