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

chore: Update React Native to 0.73.2 #31558

Merged
merged 66 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from 64 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
c72c5cd
WIP: Android builds
j-piasecki Nov 20, 2023
5377269
WIP: ios
j-piasecki Nov 20, 2023
c95f25a
Add patches
j-piasecki Nov 20, 2023
c61983e
Update onfido patch
j-piasecki Nov 20, 2023
58b5b85
Uncomment flavors
j-piasecki Nov 20, 2023
41b6807
Update `onfido` patch
j-piasecki Nov 21, 2023
266025a
Merge branch 'main' into @jpiasecki/rn-73
j-piasecki Nov 21, 2023
4738532
Update to rc.5
j-piasecki Nov 22, 2023
6305f1c
Restore deleted manifests
j-piasecki Nov 22, 2023
fe9d82e
Restore newlines
j-piasecki Nov 23, 2023
bd505cc
Update rngh
j-piasecki Nov 24, 2023
05e22df
Update patches
j-piasecki Nov 24, 2023
c3ea355
Convert `MainActivity` and `MainApplication` to kotlin
j-piasecki Nov 24, 2023
a4d30b0
Use `overrides` for RN and Reanimated versions
j-piasecki Nov 28, 2023
5f664e6
chore: bump rn and reanimated
WoLewicki Nov 28, 2023
e4cae6d
chore: merge current main
WoLewicki Nov 28, 2023
2210c09
chore: merge current main
WoLewicki Nov 29, 2023
5f57c42
fix: quick fix for typecheck
WoLewicki Nov 29, 2023
aecaf71
fix: try to make gemfile check happy
WoLewicki Nov 29, 2023
01153b8
fix: remove the cocoapods check since it is not working in the proper…
WoLewicki Nov 29, 2023
6448c59
Fix failing performance tests
j-piasecki Nov 30, 2023
56a39db
Use `cocoapods` 13
j-piasecki Nov 30, 2023
b579e80
Merge branch 'main' into @jpiasecki/rn-73
j-piasecki Nov 30, 2023
53b25fb
Recreate patch
j-piasecki Nov 30, 2023
57993bb
Remove patch for virtual lists
j-piasecki Dec 4, 2023
b928774
feat: restore podfile.lock checking with Gemfile
WoLewicki Dec 4, 2023
2cf9f57
chore: bump to stable rn73
WoLewicki Dec 6, 2023
c6f3523
Add new lines
j-piasecki Dec 8, 2023
6844584
Bump dependiecies and remove patches
j-piasecki Dec 8, 2023
6dca61e
Merge branch 'main' into @jpiasecki/rn-73
j-piasecki Dec 8, 2023
60ae463
feat: remove not needed type
WoLewicki Dec 8, 2023
9c02446
Merge branch 'main' into @jpiasecki/rn-73
j-piasecki Dec 13, 2023
7380246
Don't capture entire context in worklet closure
j-piasecki Dec 14, 2023
7e52db1
Fix lint
j-piasecki Dec 14, 2023
115489f
Merge branch 'main' into @jpiasecki/rn-73
j-piasecki Dec 14, 2023
bf632cd
Upgrade to RN 0.73.1
j-piasecki Dec 18, 2023
c4350c6
chore: merge current main
WoLewicki Dec 27, 2023
44e5860
feat: use expo cli to bump packages and fix iOS deployment version
WoLewicki Dec 28, 2023
9417eac
fix: kotlin MainApplication.kt
WoLewicki Dec 28, 2023
9781104
fix: typo
WoLewicki Dec 28, 2023
80dd7ba
fix: whole context in worklet
WoLewicki Dec 28, 2023
e282b2c
chore: merge current main
WoLewicki Dec 28, 2023
85b5099
fix: new types from react
WoLewicki Dec 28, 2023
3ff52c7
chore: run gh actions script
WoLewicki Dec 29, 2023
ca818af
fix: mock native component in webview
WoLewicki Dec 29, 2023
b941efd
chore: merge current main
WoLewicki Dec 29, 2023
a47c934
Merge branch 'main' into @jpiasecki/rn-73
WoLewicki Jan 3, 2024
e8fa09d
fix: revert expo-image version to a working one
WoLewicki Jan 4, 2024
7a8c72c
chore: merge current main
WoLewicki Jan 4, 2024
a5b7017
fix: add patch for expo-image and workaround for badge text
WoLewicki Jan 5, 2024
e119175
Merge branch 'main' into @jpiasecki/rn-73
WoLewicki Jan 5, 2024
2dba06c
Merge branch 'main' into @jpiasecki/rn-73
WoLewicki Jan 5, 2024
69566c3
fix: cover case when context is null
WoLewicki Jan 8, 2024
68c2b8e
chore: clean up code
WoLewicki Jan 8, 2024
52e0389
Update to RN 0.72.3
j-piasecki Jan 9, 2024
8606c51
Fix failing performance test
j-piasecki Jan 9, 2024
c11434b
Fix NumberOfLines patch
j-piasecki Jan 10, 2024
a3a65db
Patch wrong tint color
j-piasecki Jan 10, 2024
871a392
Update android/app/src/main/java/com/expensify/chat/MainApplication.kt
j-piasecki Jan 10, 2024
c5ce79a
Merge branch 'main' into @jpiasecki/rn-73
j-piasecki Jan 10, 2024
ca8a430
Fix dynamic tint not working
j-piasecki Jan 10, 2024
1a21456
Merge remote-tracking branch 'labs/@jpiasecki/rn-73' into @jpiasecki/…
j-piasecki Jan 10, 2024
3b605de
Merge branch 'main' into @jpiasecki/rn-73
j-piasecki Jan 11, 2024
12adc94
Remove upstreamed patch
j-piasecki Jan 11, 2024
75de5f2
Merge branch 'main' into @jpiasecki/rn-73
j-piasecki Jan 11, 2024
40b4efe
Fix test not working after revert
j-piasecki Jan 11, 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
298 changes: 104 additions & 194 deletions .github/actions/javascript/authorChecklist/index.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ source "https://rubygems.org"
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

gem "cocoapods", "~> 1.12"
gem "cocoapods", "~> 1.13"
gem "activesupport", ">= 6.1.7.3", "< 7.1.0"
gem "fastlane", "~> 2"
gem "xcpretty", "~> 0"

Expand Down
27 changes: 13 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ GEM
specs:
CFPropertyList (3.0.6)
rexml
activesupport (6.1.7.3)
activesupport (7.0.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
Expand Down Expand Up @@ -36,10 +35,10 @@ GEM
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.1.0)
cocoapods (1.12.1)
cocoapods (1.13.0)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.12.1)
cocoapods-core (= 1.13.0)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.6.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -53,8 +52,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.13.0)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand Down Expand Up @@ -162,7 +161,7 @@ GEM
apktools (~> 0.7)
aws-sdk-s3 (~> 1)
mime-types (~> 3.3)
ffi (1.15.5)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
Expand Down Expand Up @@ -207,17 +206,17 @@ GEM
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.13.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jmespath (1.6.2)
json (2.6.3)
jwt (2.7.1)
mime-types (3.4.1)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0218.1)
mime-types-data (3.2023.1003)
mini_magick (4.12.0)
mini_mime (1.1.5)
minitest (5.18.0)
minitest (5.20.0)
molinillo (0.8.0)
multi_json (1.15.0)
multipart-post (2.3.0)
Expand Down Expand Up @@ -257,7 +256,7 @@ GEM
tty-screen (0.8.1)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
typhoeus (1.4.0)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand All @@ -279,7 +278,6 @@ GEM
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)
zeitwerk (2.6.8)

PLATFORMS
arm64-darwin-21
Expand All @@ -289,7 +287,8 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
cocoapods (~> 1.12)
activesupport (>= 6.1.7.3, < 7.1.0)
cocoapods (~> 1.13)
fastlane (~> 2)
fastlane-plugin-aws_s3
xcpretty (~> 0)
Expand Down
6 changes: 6 additions & 0 deletions __mocks__/react-native-webview.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
jest.mock('react-native-webview', () => {
const {View} = require('react-native');
return {
WebView: () => View,
};
});
13 changes: 3 additions & 10 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.facebook.react"
apply plugin: "com.google.firebase.firebase-perf"
apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
Expand Down Expand Up @@ -88,6 +89,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
android {
ndkVersion rootProject.ext.ndkVersion

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

namespace "com.expensify.chat"
Expand Down Expand Up @@ -178,17 +180,8 @@ android {
dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
implementation("com.facebook.react:flipper-integration")

debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
exclude group:'com.facebook.fbjni'
}

debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
exclude group:'com.squareup.okhttp3', module:'okhttp'
}

debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
} else {
Expand Down
2 changes: 0 additions & 2 deletions android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS"/>
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning">
<meta-data
android:name="firebase_performance_logcat_enabled"
android:value="true"
/>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
</application>
</manifest>

This file was deleted.

93 changes: 0 additions & 93 deletions android/app/src/main/java/com/expensify/chat/MainActivity.java

This file was deleted.

Loading
Loading