Skip to content

Commit f90b598

Browse files
committed
test(deps): react-native update
- use 0.76: react-native-macos is still on 0.76 so 0.77+ not achievable yet - 0.76.6 has a allowRecursiveCommitsWithSynchronousMountOnAndroid pick which fails, so use 0.76.5 - note new platform minimums: macos 11.0, iOS 15.1, android 24
1 parent a12161d commit f90b598

File tree

21 files changed

+2505
-1621
lines changed

21 files changed

+2505
-1621
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
bin/
1616
gen/
1717
out/
18+
tests/android/app/.cxx
1819

1920
# Gradle files
2021
.gradle/

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,14 @@
6464
"@octokit/core": "^6.1.3",
6565
"@tsconfig/node-lts": "^20.1.3",
6666
"@types/react": "^18.3.18",
67-
"@types/react-native": "^0.73.0",
68-
"@typescript-eslint/eslint-plugin": "^7.18.0",
69-
"@typescript-eslint/parser": "^7.18.0",
67+
"@typescript-eslint/eslint-plugin": "^8.23.0",
68+
"@typescript-eslint/parser": "^8.23.0",
7069
"babel-jest": "^29.7.0",
7170
"clang-format": "^1.8.0",
7271
"conventional-changelog-cli": "^5.0.0",
7372
"cross-env": "^7.0.3",
74-
"eslint": "^8.57.1",
75-
"eslint-config-prettier": "^9.1.0",
73+
"eslint": "^9.19.0",
74+
"eslint-config-prettier": "^10.0.1",
7675
"eslint-plugin-mocha": "^10.5.0",
7776
"eslint-plugin-prettier": "^5.2.3",
7877
"eslint-plugin-react": "^7.37.4",

tests/android/app/build.gradle

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import groovy.json.JsonSlurper
1010

1111
react {
1212
/* Folders */
13-
// The root of your project, i.e. where "package.json" lives. Default is '..'
14-
// root = file("../")
15-
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
16-
// reactNativeDir = file("../node_modules/react-native")
17-
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
18-
// codegenDir = file("../node_modules/@react-native/codegen")
19-
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
20-
// cliFile = file("../node_modules/react-native/cli.js")
13+
// The root of your project, i.e. where "package.json" lives. Default is '../..'
14+
// root = file("../../")
15+
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
16+
// reactNativeDir = file("../../node_modules/react-native")
17+
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
18+
// codegenDir = file("../../node_modules/@react-native/codegen")
19+
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
20+
// cliFile = file("../../node_modules/react-native/cli.js")
2121
/* Variants */
2222
// The list of variants to that are debuggable. For those we're going to
2323
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
@@ -48,6 +48,9 @@ react {
4848
//
4949
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5050
// hermesFlags = ["-O", "-output-source-map"]
51+
52+
/* Autolinking */
53+
autolinkLibrariesWithApp()
5154
}
5255

5356
/**
@@ -176,5 +179,3 @@ dependencies {
176179
androidTestImplementation platform("com.google.firebase:firebase-bom:${firebaseBomVersion}")
177180
androidTestImplementation "com.google.firebase:firebase-appcheck-debug-testing"
178181
}
179-
180-
apply from: file('../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle'); applyNativeModulesAppBuildGradle(project)

tests/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
android:label="@string/app_name"
1111
android:launchMode="singleTask"
1212
android:theme="@style/AppTheme"
13+
android:supportsRtl="true"
1314
tools:targetApi="m">
1415
<meta-data android:name="rnfirebase_meta_testing_string" android:value="abc" />
1516
<meta-data android:name="rnfirebase_meta_testing_boolean_false" android:value="false" />

tests/android/app/src/main/java/com/invertase/testing/MainApplication.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.facebook.react.ReactPackage
1010
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
1111
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1212
import com.facebook.react.defaults.DefaultReactNativeHost
13+
import com.facebook.react.soloader.OpenSourceMergedSoMapping
1314
import com.facebook.soloader.SoLoader
1415
import io.invertase.firebase.app.ReactNativeFirebaseApp
1516

@@ -37,7 +38,7 @@ class MainApplication : Application(), ReactApplication {
3738

3839
override fun onCreate() {
3940
super.onCreate()
40-
SoLoader.init(this, false)
41+
SoLoader.init(this, OpenSourceMergedSoMapping)
4142
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
4243
// If you opted-in for the New Architecture, we load the native entry point for this app.
4344
load()

tests/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
2-
ext.buildToolsVersion = "34.0.0"
3-
ext.minSdkVersion = 23
4-
ext.compileSdkVersion = 34
2+
ext.buildToolsVersion = "35.0.0"
3+
ext.minSdkVersion = 24
4+
ext.compileSdkVersion = 35
55
ext.targetSdkVersion = 34
66

77
ext.ndkVersion = "26.1.10909125"

tests/android/gradle.properties

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8
2020

2121
android.useAndroidX=true
2222

23-
# We may finally disable this!
24-
#android.enableJetifier=true
25-
2623
firebasePerformanceInstrumentationEnabled=false
2724

2825
# Use this property to specify which architecture you want to build.
@@ -35,7 +32,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
3532
# your application. You should enable this flag either if you want
3633
# to write custom TurboModules/Fabric components OR use libraries that
3734
# are providing them.
38-
newArchEnabled=false
35+
newArchEnabled=true
3936

4037
# Use this property to enable or disable the Hermes JS engine.
4138
# If set to false, you will be using JSC instead.
130 Bytes
Binary file not shown.

tests/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

tests/android/gradlew

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)