Skip to content

Commit 5e4420f

Browse files
chore: Upgrade react native to v0.74
1 parent 4d5cef5 commit 5e4420f

File tree

23 files changed

+15746
-10638
lines changed

23 files changed

+15746
-10638
lines changed

.github/workflows/e2e_android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
sudo udevadm trigger --name-match=kvm
3838
3939
- name: Install dependencies
40-
run: yarn --frozen-lockfile
40+
run: yarn --immutable
4141

4242
- name: Setup Java
4343
uses: actions/setup-java@v3

.github/workflows/e2e_ios.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
e2e-ios:
10-
runs-on: macos-12
10+
runs-on: macos-latest
1111
steps:
1212
- name: Checkout repository
1313
uses: actions/checkout@v4
@@ -19,7 +19,7 @@ jobs:
1919
node-version-file: .node-version
2020

2121
- name: Install dependencies
22-
run: yarn --frozen-lockfile
22+
run: yarn --immutable
2323

2424
- name: Install macOS dependencies
2525
run: |

.github/workflows/lint_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
node-version-file: .node-version
1515

1616
- name: Install
17-
run: yarn install --frozen-lockfile
17+
run: yarn install --immutable
1818

1919
- name: Lint
2020
run: yarn lint

.github/workflows/staging_build_android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# run: echo "${{secrets.FIREBASE_SERVICE_ACCOUNT_JSON}}" > "${{ github.workspace }}/firebase-service-account.json"
4343

4444
- name: Install
45-
run: yarn install --frozen-lockfile
45+
run: yarn install --immutable
4646

4747
- name: Setup Ruby
4848
uses: ruby/setup-ruby@v1

.gitignore

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ DerivedData
2222
*.hmap
2323
*.ipa
2424
*.xcuserstate
25-
ios/.xcode.env.local
25+
**/.xcode.env.local
2626

2727
# Android/IntelliJ
2828
#
@@ -58,7 +58,7 @@ yarn-error.log
5858
*.jsbundle
5959

6060
# Ruby / CocoaPods
61-
/ios/Pods/
61+
**/Pods/
6262
/vendor/bundle/
6363

6464
# Temporary files created by Metro to check the health of the file watcher
@@ -73,3 +73,11 @@ artifacts/
7373

7474
# IDE
7575
.vscode
76+
77+
# Yarn
78+
.yarn/*
79+
!.yarn/patches
80+
!.yarn/plugins
81+
!.yarn/releases
82+
!.yarn/sdks
83+
!.yarn/versions

.yarn/releases/yarn-4.1.1.cjs

Lines changed: 893 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
nodeLinker: node-modules
2+
3+
yarnPath: .yarn/releases/yarn-4.1.1.cjs

android/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ android {
113113
dependencies {
114114
// The version of react-native is set by the React Native Gradle Plugin
115115
implementation("com.facebook.react:react-android")
116-
implementation("com.facebook.react:flipper-integration")
117116

118117
if (hermesEnabled.toBoolean()) {
119118
implementation("com.facebook.react:hermes-android")

android/app/src/main/java/io/tshdev/reactnativestarter/MainApplication.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import com.facebook.react.ReactPackage
99
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
1010
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1111
import com.facebook.react.defaults.DefaultReactNativeHost
12-
import com.facebook.react.flipper.ReactNativeFlipper
1312
import com.facebook.soloader.SoLoader
1413

1514
class MainApplication : Application(), ReactApplication {
@@ -31,7 +30,7 @@ class MainApplication : Application(), ReactApplication {
3130
}
3231

3332
override val reactHost: ReactHost
34-
get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
33+
get() = getDefaultReactHost(applicationContext, reactNativeHost)
3534

3635
override fun onCreate() {
3736
super.onCreate()
@@ -40,6 +39,5 @@ class MainApplication : Application(), ReactApplication {
4039
// If you opted-in for the New Architecture, we load the native entry point for this app.
4140
load()
4241
}
43-
ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
4442
}
4543
}

android/app/src/main/res/drawable/rn_edit_text_material.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
1818
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
1919
android:insetTop="@dimen/abc_edit_text_inset_top_material"
20-
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
20+
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"
21+
>
2122

2223
<selector>
2324
<!--

0 commit comments

Comments
 (0)