Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade RN to v0.74.3, bump outdated packages #5739

Merged
merged 147 commits into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from 131 commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
e6914be
Bump RN to v0.72.14, bump outdated packages
christianbaroni May 16, 2024
b19db94
Bump patches, remove outdated patches
christianbaroni May 16, 2024
1a29946
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni May 16, 2024
fb8280b
lint
christianbaroni May 20, 2024
7d25113
Fix old Skia code
christianbaroni May 23, 2024
d282088
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 3, 2024
9b67000
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 3, 2024
d6e5eb6
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 6, 2024
56b52f9
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 10, 2024
d2a7ce5
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 11, 2024
fa6f0d2
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 12, 2024
cd3a6e7
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 13, 2024
51fef59
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 14, 2024
617c9af
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 15, 2024
d8ef517
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 17, 2024
38b7aa4
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 25, 2024
5b609bb
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 27, 2024
c0638da
Upgrade RN to 0.74.2
christianbaroni Jun 27, 2024
4e060f3
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jun 27, 2024
aa5cdf4
Bump RN to latest, bump Reanimated to v3.13.0 release
christianbaroni Jul 9, 2024
fb5cb65
Remove codegen from RN patch, re-add squircle patch
christianbaroni Jul 9, 2024
5359e06
Resolve all patch warnings, fix package.json
christianbaroni Jul 9, 2024
471c51e
Fix react-native-video type errors
christianbaroni Jul 9, 2024
87d3fb8
Upgrade Firebase
christianbaroni Jul 9, 2024
78943fd
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jul 9, 2024
94c5923
Refresh yarn.lock
christianbaroni Jul 9, 2024
1a38833
Fix yarn.lock, delete and ignore all instances of install-state.gz
christianbaroni Jul 10, 2024
01946b5
Fix Moti types
christianbaroni Jul 10, 2024
436b397
Test CI change
christianbaroni Jul 10, 2024
0c73cc4
Undo setup-ci change
christianbaroni Jul 10, 2024
70d2c35
Rebuild react-native-animated-charts yarn.lock files
christianbaroni Jul 10, 2024
a1a356a
Fully rebuild subpackage lock files
christianbaroni Jul 10, 2024
c495a9e
Bump packages
christianbaroni Jul 10, 2024
c37d85d
Undo graphql yarn.lock changes
christianbaroni Jul 10, 2024
d2a9750
small changes
brunobar79 Jul 10, 2024
184f523
Refresh lock files, dependency fixes
christianbaroni Jul 10, 2024
3c63ee6
Fix react-native-screen-corner-radius lint errors
christianbaroni Jul 10, 2024
461278a
Fix lint errors
christianbaroni Jul 10, 2024
f51d004
fix
brunobar79 Jul 10, 2024
1a1edea
target CI-9
brunobar79 Jul 10, 2024
369116d
Try emptying lock files
christianbaroni Jul 10, 2024
34123cc
Revert "Try emptying lock files"
christianbaroni Jul 10, 2024
498d1f1
Refresh lock files again
christianbaroni Jul 10, 2024
871727e
Fully rebuild lock files
christianbaroni Jul 11, 2024
5517311
Add subpackage lock files
christianbaroni Jul 11, 2024
644e2a6
Merge remote-tracking branch 'origin/@bruno/react-native-upgrade' int…
christianbaroni Jul 11, 2024
93b0a1c
Ignore charts example app
christianbaroni Jul 11, 2024
6f3460f
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jul 11, 2024
bcc34f7
Remove tooltips devDependencies
christianbaroni Jul 11, 2024
c1a2886
Update yarn.lock
christianbaroni Jul 11, 2024
9b31dd6
bump react-native-tooltips
brunobar79 Jul 11, 2024
891ea21
Merge branch '@christian/upgrade-rn' into @bruno/react-native-upgrade
brunobar79 Jul 11, 2024
cdf2fc9
Enable inline yarn logs
christianbaroni Jul 11, 2024
cb0fed1
tmp env var update
brunobar79 Jul 11, 2024
ce4a7ff
Merge branch '@bruno/react-native-upgrade' of github.com:rainbow-me/r…
brunobar79 Jul 11, 2024
e6cb789
fixes
brunobar79 Jul 11, 2024
5cfa38f
Merge branch '@christian/upgrade-rn' into @bruno/react-native-upgrade
brunobar79 Jul 11, 2024
212ee10
Test CI changes
christianbaroni Jul 11, 2024
a368139
run install once
brunobar79 Jul 11, 2024
3062651
lockfile
brunobar79 Jul 11, 2024
ffc7cbb
Merge branch '@christian/upgrade-rn' into @bruno/react-native-upgrade
brunobar79 Jul 11, 2024
a0325b9
Update macstadium-e2e.yml
brunobar79 Jul 11, 2024
07336fa
Revert "Test CI changes"
christianbaroni Jul 11, 2024
451e7f5
Revert "Enable inline yarn logs"
christianbaroni Jul 11, 2024
9a4addc
fix typo
brunobar79 Jul 11, 2024
0986b99
Merge branch '@christian/upgrade-rn' into @bruno/react-native-upgrade
brunobar79 Jul 11, 2024
dd2a96e
just do yarn install
brunobar79 Jul 11, 2024
7c74e89
rename vars tmp
brunobar79 Jul 11, 2024
9c4b58d
add missing types
brunobar79 Jul 11, 2024
0d18528
Try using sh for CI script
christianbaroni Jul 11, 2024
fc6deb1
Revert "Try using sh for CI script"
christianbaroni Jul 11, 2024
49d640b
disable linter
brunobar79 Jul 11, 2024
0c55b9f
disable unit tests
brunobar79 Jul 11, 2024
4ddfaae
Try all setup-ci steps
christianbaroni Jul 11, 2024
053fdda
Add yarn install
christianbaroni Jul 11, 2024
82927a2
Try cache clean
christianbaroni Jul 11, 2024
98b316e
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jul 11, 2024
6145fab
Rebuild yarn.lock
christianbaroni Jul 11, 2024
3075559
bundle before pod install
brunobar79 Jul 11, 2024
4e62581
back to yarn setup
brunobar79 Jul 11, 2024
f6b892f
Merge branch '@christian/upgrade-rn' into @bruno/react-native-upgrade
brunobar79 Jul 11, 2024
1d61784
yarn setup doesnt work
brunobar79 Jul 11, 2024
790db39
fix lockfile
brunobar79 Jul 11, 2024
878d5cc
Try checksumBehavior: reset
christianbaroni Jul 11, 2024
8c11977
update lockfile
brunobar79 Jul 11, 2024
5f8607c
Fix lint
christianbaroni Jul 11, 2024
1f871b6
Fix scripts path
christianbaroni Jul 11, 2024
ceb1785
fix ts issues
brunobar79 Jul 11, 2024
55cb9a8
fix commands
brunobar79 Jul 11, 2024
ba51f3a
Merge branch '@christian/upgrade-rn' into @bruno/react-native-upgrade
brunobar79 Jul 11, 2024
358fb6c
fix
brunobar79 Jul 11, 2024
d9bbd1d
fix more types
brunobar79 Jul 11, 2024
e665bba
restore rn tooltips to the right branch
brunobar79 Jul 11, 2024
3e5973b
Fix pod install warnings
christianbaroni Jul 11, 2024
39d3d87
Possibly fix build errors
christianbaroni Jul 11, 2024
fafc919
Bump detox
christianbaroni Jul 11, 2024
3f10f64
Merge remote-tracking branch 'origin/@bruno/react-native-upgrade' int…
christianbaroni Jul 11, 2024
aa342cc
Trigger CI
christianbaroni Jul 11, 2024
8c246f0
Revert "Trigger CI"
christianbaroni Jul 11, 2024
a628d3b
Tighten node version
christianbaroni Jul 12, 2024
6a8cd20
add version debugging
brunobar79 Jul 12, 2024
56837da
debug
brunobar79 Jul 12, 2024
ca4994b
yarn detox
brunobar79 Jul 12, 2024
5a65bdf
update rn patch
brunobar79 Jul 12, 2024
b49b1c5
show node path
brunobar79 Jul 12, 2024
2e18739
more debugging and permissions
brunobar79 Jul 12, 2024
71a4afc
rn info
brunobar79 Jul 12, 2024
cd94e30
use zshrc
brunobar79 Jul 12, 2024
2747be7
update min ruby version on gemfile
brunobar79 Jul 12, 2024
d2c30ed
remove xcpretty
brunobar79 Jul 12, 2024
a10903f
add metro transformer
brunobar79 Jul 12, 2024
c036a8a
Remove old ratio.me react-native-webview metro exception
christianbaroni Jul 15, 2024
9f9d56a
Use @react-native/metro-babel-transformer, bump reanimated
christianbaroni Jul 15, 2024
849516a
Restore query-core patch
christianbaroni Jul 16, 2024
99e89da
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jul 16, 2024
f61ceeb
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jul 16, 2024
9884b53
Rebuild lock files
christianbaroni Jul 16, 2024
17a7a2d
Fix ENS resolution in send, remove unused imports
christianbaroni Jul 16, 2024
10741f9
Fix resolveNameOrAddress
christianbaroni Jul 16, 2024
2e7ccc2
Remove old GH root view
christianbaroni Jul 16, 2024
0175f9f
Undo Detox version bump
christianbaroni Jul 16, 2024
55ae39e
Remove .yarnrc, clean up resolveNameOrAddress return types
christianbaroni Jul 16, 2024
fdb7dd1
Remove Unstoppable send flow test
christianbaroni Jul 16, 2024
9a0f85d
Fix Hardhat command
christianbaroni Jul 17, 2024
c8d4e98
Re-enable all CI steps
christianbaroni Jul 17, 2024
b69f143
Update CI cache for Yarn 4
christianbaroni Jul 17, 2024
b63c3cf
Revert "Restore query-core patch"
christianbaroni Jul 17, 2024
3598a19
Fix local e2e crash due to GH button in RainbowContextWrapper
christianbaroni Jul 17, 2024
25aa174
Use metro-plugin-anisotropic-transform main branch
christianbaroni Jul 17, 2024
5605b62
Update yarn.lock
christianbaroni Jul 17, 2024
b27851b
Enable inline yarn logs
christianbaroni Jul 17, 2024
ee33cbf
Fix unpinning
christianbaroni Jul 18, 2024
8b2f2ef
Possibly fix duplicate Android installs
christianbaroni Jul 18, 2024
0ed27ad
Make patch-package work with Yarn 4
christianbaroni Jul 18, 2024
0ee4f50
Reapply @tanstack/query-core patch
christianbaroni Jul 18, 2024
154592e
Updated bitrise.yml with explicit yarn install
jinchung Jul 19, 2024
d0b34a8
Merge branch 'develop' into @christian/upgrade-rn
christianbaroni Jul 19, 2024
06514d3
Fix bitrise.yml formatting
christianbaroni Jul 19, 2024
0245eb3
Fix lint error, add .yarn to .prettierignore
christianbaroni Jul 19, 2024
7f99093
Fix update-token-list script
christianbaroni Jul 19, 2024
50dde72
Fix Bitrise code signing
christianbaroni Jul 19, 2024
1dc1af1
Fix provisioning profiles
christianbaroni Jul 20, 2024
6c098a4
More project.pbxproj fixes
christianbaroni Jul 20, 2024
73025d3
More project.pbxproj edits
christianbaroni Jul 20, 2024
4306d19
Revert "More project.pbxproj edits"
christianbaroni Jul 20, 2024
7cfe578
Revert "More project.pbxproj fixes"
christianbaroni Jul 20, 2024
0a8a723
Fix CODE_SIGN_IDENTITY
christianbaroni Jul 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions .github/workflows/macstadium-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: iOS e2e tests
on: [pull_request, workflow_dispatch]
jobs:
ios-e2e:
runs-on: ["self-hosted"]
runs-on: ["self-hosted", "CI-9"]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -23,29 +23,35 @@ jobs:

- name: Set up ENV vars & scripts
env:
CI_SCRIPTS: ${{ secrets.CI_SCRIPTS }}
CI_SCRIPTS_RN_UPGRADE: ${{ secrets.CI_SCRIPTS_RN_UPGRADE }}
run: |
source ~/.bashrc
source ~/.zshrc
git clone [email protected]:rainbow-me/rainbow-env.git
mv rainbow-env/dotenv .env && rm -rf rainbow-env
eval $CI_SCRIPTS
sed -i'' -e "s/IS_TESTING=false/IS_TESTING=true/" .env && rm -f .env-e
eval $CI_SCRIPTS_RN_UPGRADE
sed -i'' -e "s/IS_TESTING=false/IS_TESTING=true/" .env && rm -f .env-e

- name: Get Yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT

- name: Cache Yarn dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
~/.cache/yarn
node_modules
${{ steps.yarn-cache-dir-path.outputs.dir }}
.yarn/cache
.yarn/install-state.gz
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

- name: Install dependencies
run: yarn setup-ci
run: |
yarn cache clean --all && yarn install && yarn setup

- name: Check for frozen lockfile
run: yarn check-lockfile
run: ./scripts/check-lockfile.sh

- name: Audit CI
run: yarn audit-ci --config audit-ci.jsonc
Expand All @@ -60,11 +66,20 @@ jobs:
run: ./node_modules/.bin/detox clean-framework-cache && ./node_modules/.bin/detox build-framework-cache

- name: Install pods
run: yarn install-pods
run: yarn install-bundle && yarn install-pods

- name: Fix permissions
run: |
chmod -R +x node_modules/react-native/scripts
chmod -R +x node_modules/@sentry/react-native/scripts

- name: Version debug
run: |
npx react-native info

- name: Build the app in release mode
run: ./node_modules/.bin/detox build --configuration ios.sim.release | xcpretty --color
run: yarn detox build --configuration ios.sim.release

# change the '3' here to how many times you want the tests to rerun on failure
- name: Run iOS e2e tests with retry
run: ./scripts/run-retry-tests.sh 3
run: ./scripts/run-retry-tests.sh 3
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ios/GoogleService-Info.plist
ios/ReaHeader.h
ios/AppDelegate.pch
.DS_Store
ios/Pods/
**/Pods/
ios/*dSYM.zip
ios/debug.xcconfig
ios/release.xcconfig
Expand All @@ -32,6 +32,7 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
**/.xcode.env.local
project.xcworkspace
ios/main.jsbundle.map
src/config/debug.ts
Expand Down Expand Up @@ -122,3 +123,11 @@ coverage

# Webpack
InjectedJSBundle.js.LICENSE.txt

# Yarn
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/react-native-animated-charts/Example/**
894 changes: 894 additions & 0 deletions .yarn/releases/yarn-4.2.2.cjs

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions .yarnrc

This file was deleted.

7 changes: 7 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.2.2.cjs
enableScripts: false
checksumBehavior: reset
defaultSemverRangePrefix: ''
enableInlineBuilds: true
2 changes: 1 addition & 1 deletion android/Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby '>= 2.6.10'
ruby '>= 2.7.0'

gem "fastlane"
18 changes: 4 additions & 14 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: "com.android.application"
apply plugin: "org.jetbrains.kotlin.android"
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'

Expand Down Expand Up @@ -125,18 +126,8 @@ android {
}
}

def props = project.file('src/main/java/me/rainbow/MainApplication.java')
def contents2 = props.getText( 'UTF-8' ).replaceAll( "//_REA ", '' ).replaceAll('/\\* REA', '//_REA /* REA')
props.delete()
props << contents2

if (env.get('DISABLE_REANIMATED_IN_DEV') == 'YES') {
def contents = props.getText( 'UTF-8' ).replaceAll( "//_REA ", '' )
props.delete()
props << contents
}

compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
compileSdk rootProject.ext.compileSdkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down Expand Up @@ -220,8 +211,7 @@ dependencies {
implementation 'io.github.novacrypto:BIP39:2019.01.27'
implementation 'com.google.android.play:core:1.8.2'
implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
implementation "androidx.core:core-splashscreen:1.0.0"
implementation project(':react-native-plaid-link-sdk')
implementation "androidx.core:core-splashscreen:1.0.1"

if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
Expand Down
3 changes: 2 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
android:networkSecurityConfig="@xml/network_security_config"
android:requestLegacyExternalStorage="true"
android:resizeableActivity="false"
tools:ignore="GoogleAppIndexingWarning"
>
<meta-data
android:name="com.google.mlkit.vision.DEPENDENCIES"
Expand All @@ -51,6 +52,7 @@
android:launchMode="singleTask"
android:windowSoftInputMode="adjustPan">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
</intent-filter>
Expand Down Expand Up @@ -259,7 +261,6 @@
</intent-filter>
</activity-alias>

<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
<!-- Branch init -->
<meta-data android:name="io.branch.sdk.BranchKey" android:value="${BRANCH_KEY}" />
<meta-data android:name="io.branch.sdk.TestMode" android:value="false" />
Expand Down
69 changes: 0 additions & 69 deletions android/app/src/main/java/me/rainbow/MainActivity.java

This file was deleted.

55 changes: 55 additions & 0 deletions android/app/src/main/java/me/rainbow/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package me.rainbow

import android.content.Intent
import android.content.res.Configuration
import android.os.Bundle
import android.webkit.WebView
import com.facebook.react.ReactActivity
import com.facebook.react.ReactActivityDelegate
import com.facebook.react.modules.network.OkHttpClientProvider
import com.zoontek.rnbootsplash.RNBootSplash
import io.branch.rnbranch.RNBranchModule
import me.rainbow.NativeModules.Internals.CustomNetworkModule
import me.rainbow.NativeModules.RNBackHandler.RNBackHandlerPackage

class MainActivity : ReactActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
RNBootSplash.init(this, R.style.BootTheme) // Initialize the splash screen
super.onCreate(null) // Pass null here as required by react-native-screens
OkHttpClientProvider.setOkHttpClientFactory(CustomNetworkModule())
WebView.setWebContentsDebuggingEnabled(false)
}

/**
* Returns the name of the main component registered from JavaScript. This is used to schedule
* rendering of the component.
*/
override fun getMainComponentName(): String {
return "Rainbow"
}

override fun onStart() {
super.onStart()
RNBranchModule.initSession(intent.data, this)
}

override fun onBackPressed() {
if (!RNBackHandlerPackage.sBlockBack) {
super.onBackPressed()
}
}

override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
reactInstanceManager.onConfigurationChanged(this, newConfig)
}

override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
setIntent(intent)
RNBranchModule.onNewIntent(intent)
}

override fun createReactActivityDelegate(): ReactActivityDelegate =
ReactActivityDelegate(this, mainComponentName)
}
Loading
Loading