Skip to content

Commit 4f79e8c

Browse files
Merge branch 'main' into fix/unify-types-between-mobile-and-web
2 parents ac10496 + 799cc6b commit 4f79e8c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+3059
-1703
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,6 @@ module.exports = {
100100
'jest/prefer-to-have-length': 'warn',
101101
'jest/valid-expect': 'error',
102102
'react/react-in-jsx-scope': 'off',
103+
'import/no-duplicates': 'warn', // Avoid issues in native component specs since 0.81
103104
},
104105
};

apps/common-app/package.json

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,30 @@
77
"react-native": "*"
88
},
99
"dependencies": {
10-
"@react-navigation/native": "7.1.13",
11-
"@react-navigation/native-stack": "7.3.18",
12-
"@react-navigation/stack": "7.3.6",
10+
"@react-navigation/native": "7.1.17",
11+
"@react-navigation/native-stack": "7.3.25",
12+
"@react-navigation/stack": "7.4.7",
1313
"@shopify/react-native-skia": "2.1.1",
1414
"react-native-audio-api": "workspace:*",
1515
"react-native-background-timer": "^2.4.1",
1616
"react-native-dotenv": "3.4.11",
17-
"react-native-gesture-handler": "2.26.0",
18-
"react-native-reanimated": "3.18.0",
19-
"react-native-safe-area-context": "5.4.1",
20-
"react-native-screens": "4.11.1",
21-
"react-native-svg": "15.12.0"
17+
"react-native-gesture-handler": "2.28.0",
18+
"react-native-reanimated": "3.19.1",
19+
"react-native-safe-area-context": "5.6.0",
20+
"react-native-screens": "4.14.1",
21+
"react-native-svg": "15.12.1"
2222
},
2323
"devDependencies": {
2424
"@babel/core": "^7.25.2",
2525
"@babel/preset-env": "^7.25.2",
2626
"@babel/runtime": "^7.25.0",
27-
"@react-native/babel-preset": "0.80.0",
28-
"@react-native/eslint-config": "0.80.0",
29-
"@react-native/metro-config": "0.80.0",
30-
"@react-native/typescript-config": "0.80.0",
27+
"@react-native-community/cli": "20.0.0",
28+
"@react-native-community/cli-platform-android": "20.0.0",
29+
"@react-native-community/cli-platform-ios": "20.0.0",
30+
"@react-native/babel-preset": "0.81.0",
31+
"@react-native/eslint-config": "0.81.0",
32+
"@react-native/metro-config": "0.81.0",
33+
"@react-native/typescript-config": "0.81.0",
3134
"@types/jest": "^29.5.13",
3235
"@types/react": "^19.1.0",
3336
"@types/react-native-background-timer": "^2.0.2",
@@ -36,8 +39,8 @@
3639
"jest": "^29.6.3",
3740
"prettier": "^3.3.3",
3841
"react": "19.1.0",
39-
"react-native": "0.80.0",
42+
"react-native": "0.81.0",
4043
"react-test-renderer": "19.1.0",
41-
"typescript": "~5.3.0"
44+
"typescript": "5.8.3"
4245
}
4346
}

apps/fabric-example/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "35.0.0"
3+
buildToolsVersion = "36.0.0"
44
minSdkVersion = 24
5-
compileSdkVersion = 35
6-
targetSdkVersion = 35
5+
compileSdkVersion = 36
6+
targetSdkVersion = 36
77
ndkVersion = "27.1.12297006"
88
kotlinVersion = "2.1.20"
99
}

apps/fabric-example/android/gradle.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,8 @@ newArchEnabled=true
3737
# Use this property to enable or disable the Hermes JS engine.
3838
# If set to false, you will be using JSC instead.
3939
hermesEnabled=true
40+
41+
# Use this property to enable edge-to-edge display support.
42+
# This allows your app to draw behind system bars for an immersive UI.
43+
# Note: Only works with ReactActivity and should not be used with custom Activity.
44+
edgeToEdgeEnabled=false

apps/fabric-example/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.14.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)