Skip to content

Commit 188f000

Browse files
YogendraShelkeYogendraShelke
committed
Merge branch 'master' into moo/MOO-2027-mendix-native-upgrade
2 parents d1eaee4 + a27cb1b commit 188f000

9 files changed

Lines changed: 66 additions & 60 deletions

File tree

‎.mx/known_dependencies.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"@react-native-firebase/app": "17.3.0",
3-
"@react-native-firebase/messaging": "17.3.0",
4-
"@react-native-firebase/crashlytics": "17.3.0",
2+
"@react-native-firebase/app": "20.1.0",
3+
"@react-native-firebase/messaging": "20.1.0",
4+
"@react-native-firebase/crashlytics": "20.1.0",
55
"@notifee/react-native": "9.1.8",
66
"react-native-maps": "0.31.1"
77
}

‎.mx/releases_list.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
[
2+
{
3+
"id": 257444967,
4+
"tag_name": "v15.4.2",
5+
"name": "Release 15.4.2",
6+
"draft": false,
7+
"prerelease": false,
8+
"body": "- We have installed react-native-edge-to-edge to fix issues in android 15+",
9+
"created_at": "2025-10-27T11:42:39Z",
10+
"published_at": "2025-10-27T11:44:02Z",
11+
"tarball_url": "https://api.github.com/repos/mendix/native-template/tarball/v15.4.2",
12+
"zipball_url": "https://api.github.com/repos/mendix/native-template/zipball/v15.4.2"
13+
},
14+
{
15+
"id": 257445013,
16+
"tag_name": "v14.1.7",
17+
"name": "Release 14.1.7",
18+
"draft": false,
19+
"prerelease": false,
20+
"body": "- We have installed react-native-edge-to-edge to fix issues in android 15+",
21+
"created_at": "2025-10-27T11:42:50Z",
22+
"published_at": "2025-10-27T11:44:13Z",
23+
"tarball_url": "https://api.github.com/repos/mendix/native-template/tarball/v14.1.7",
24+
"zipball_url": "https://api.github.com/repos/mendix/native-template/zipball/v14.1.7"
25+
},
226
{
327
"id": 252692529,
428
"tag_name": "v15.4.1",
@@ -1174,29 +1198,5 @@
11741198
"published_at": "2023-01-20T14:13:28Z",
11751199
"tarball_url": "https://api.github.com/repos/mendix/native-template/tarball/v5.2.16",
11761200
"zipball_url": "https://api.github.com/repos/mendix/native-template/zipball/v5.2.16"
1177-
},
1178-
{
1179-
"id": 87296164,
1180-
"tag_name": "v6.3.4",
1181-
"name": "Release 6.3.4",
1182-
"draft": false,
1183-
"prerelease": false,
1184-
"body": "### Fixes\r\n- We changed the order of repositories in Android builds to fix an issue with jitpack.io",
1185-
"created_at": "2022-12-27T11:49:04Z",
1186-
"published_at": "2022-12-27T11:54:12Z",
1187-
"tarball_url": "https://api.github.com/repos/mendix/native-template/tarball/v6.3.4",
1188-
"zipball_url": "https://api.github.com/repos/mendix/native-template/zipball/v6.3.4"
1189-
},
1190-
{
1191-
"id": 87296176,
1192-
"tag_name": "v6.2.29",
1193-
"name": "Release 6.2.29",
1194-
"draft": false,
1195-
"prerelease": false,
1196-
"body": "### Fixes\r\n- We changed the order of repositories in Android builds to fix an issue with jitpack.io",
1197-
"created_at": "2022-12-27T11:49:20Z",
1198-
"published_at": "2022-12-27T11:54:02Z",
1199-
"tarball_url": "https://api.github.com/repos/mendix/native-template/tarball/v6.2.29",
1200-
"zipball_url": "https://api.github.com/repos/mendix/native-template/zipball/v6.2.29"
12011201
}
12021202
]

‎android/app/src/main/res/values/styles.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<resources>
22

33
<!-- Base light application theme. -->
4-
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
4+
<style name="AppTheme" parent="Theme.EdgeToEdge.Light">
55
<!-- Customize your theme here. -->
66
<item name="android:windowDisablePreview">true</item>
77
<item name="android:windowIsTranslucent">true</item>
88
<item name="android:editTextStyle">@style/MendixEditText</item>
99
</style>
1010
<!-- Base dark application theme. -->
11-
<style name="AppTheme_Dark" parent="Theme.AppCompat.DayNight.NoActionBar">
11+
<style name="AppTheme_Dark" parent="Theme.EdgeToEdge">
1212
<!-- Customize your theme here. -->
1313
<item name="android:windowDisablePreview">true</item>
1414
<item name="android:windowIsTranslucent">true</item>

‎android/build.gradle‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,22 @@ buildscript {
3636
}
3737
}
3838

39+
40+
project.ext {
41+
set('react-native', [
42+
versions: [
43+
// Override Firebase BOM version to avoid updating to react-native-firebase 20.2.0+,
44+
// which adds many new node_modules increasing the size significantly.
45+
// Affected dependencies include the entire react-native-firebase suite e.g.:
46+
// @react-native-firebase/app, @react-native-firebase/analytics, @react-native-firebase/crashlytics, @react-native-firebase/messaging
47+
// NOTE: If updating to react-native-firebase 20.2.0+ is done, this override should be removed.
48+
firebase: [
49+
bom: "33.1.1"
50+
],
51+
],
52+
])
53+
}
54+
3955
allprojects {
4056
repositories {
4157
all { repo ->

‎android/gradle.properties‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ android.suppressUnsupportedCompileSdk=33
2626
newArchEnabled=true
2727
hermesEnabled=true
2828
mendixnative.cookieEncryption=false
29-
VisionCamera_enableCodeScanner=true
29+
VisionCamera_enableCodeScanner=true
30+
31+
# Enable edge-to-edge display
32+
edgeToEdgeEnabled=true

‎intermediary-patches/@react-native-firebase+messaging+17.3.0.patch‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎package-lock.json‎

Lines changed: 13 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "native-template",
3-
"version": "15.4.1",
3+
"version": "15.4.2",
44
"private": true,
55
"scripts": {
66
"postinstall": "node patches/apply-patches.js && jetify",
@@ -19,10 +19,11 @@
1919
"@react-native-community/cli-platform-ios": "16.0.2",
2020
"@react-native-community/datetimepicker": "8.2.0",
2121
"@react-native-picker/picker": "2.11.0",
22-
"react-native-device-info": "14.0.4",
2322
"@react-navigation/native": "7.0.14",
2423
"react-native": "0.77.3",
2524
"react-native-blob-util": "0.21.2",
25+
"react-native-device-info": "14.0.4",
26+
"react-native-edge-to-edge": "1.7.0",
2627
"react-native-gesture-handler": "2.23.1",
2728
"react-native-image-picker": "7.2.3",
2829
"react-native-localize": "3.2.1",
@@ -62,4 +63,4 @@
6263
"react-dom": "18.3.1",
6364
"react-native": "0.77.3"
6465
}
65-
}
66+
}

‎patches/apply-patches.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ const patchOperations = [
77
{
88
dependency: "react-native-geocoder",
99
patchFile: "react-native-geocoder+0.5.0.patch"
10-
},
11-
{
12-
dependency: "@react-native-firebase/app",
13-
patchFile: "@react-native-firebase+messaging+17.3.0.patch"
1410
}
1511
];
1612

0 commit comments

Comments
 (0)