Skip to content

Commit bf256f4

Browse files
Merge branch 'release/17.x.x' into moo/MOO-2286-docs-pr-automation-17-x-x
2 parents cf14ad5 + 0f5c8a4 commit bf256f4

9 files changed

Lines changed: 961 additions & 808 deletions

File tree

.github/workflows/ios-build-custom-dev-app.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v3
16-
- name: switch XCode to 16.4
16+
- name: switch XCode to 26.2
1717
run: |
18-
sudo xcode-select -s /Applications/Xcode_16.4.app
18+
sudo xcode-select -s /Applications/Xcode_26.2.app
1919
2020
- name: update bundle identifier in Dev config
2121
shell: bash

.mx/known_dependencies.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"@react-native-firebase/app": "20.1.0",
33
"@react-native-firebase/messaging": "20.1.0",
44
"@react-native-firebase/crashlytics": "20.1.0",
5-
"@notifee/react-native": "9.1.8",
5+
"react-native-notify-kit": "10.4.7",
66
"react-native-maps": "0.31.1"
77
}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
77
## [Unreleased]
88

99
- We fixed an issue that could cause apps to restart repeatedly after an OTA update on iOS.
10+
- Replaced @notifee/react-native with react-native-notify-kit library.
1011

1112
## [17.3.0] - 2026-06-03
1213

android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.mendix.nativetemplate">
55

6+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
67
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
78

89
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning"/>

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<uses-permission android:name="android.permission.VIBRATE" />
2222
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
2323
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
24+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
2425
<!-- Required for scheduling local notifications -->
2526
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
2627
<!-- If this app uses ads, remove 'tools:node="remove"' to enable ad ID access. -->

android/build.gradle

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,16 @@ project.ext {
5454

5555
allprojects {
5656
repositories {
57-
all { repo ->
58-
println repo.url.toString()
59-
if (repo.url.toString().contains("jcenter.bintray.com") || repo.url.toString().contains("jitpack.io")) {
60-
project.logger.warn "Repository ${repo.url} removed."
61-
remove repo
62-
google()
63-
mavenCentral()
64-
}
65-
}
66-
maven {
67-
url "$rootDir/../node_modules/@notifee/react-native/android/libs"
68-
}
6957
google()
58+
mavenCentral()
59+
7060
maven {
7161
url "https://maven.fabric.io/public"
7262
}
73-
maven { url "https://www.jitpack.io" }
74-
maven { url "https://packages.rnd.mendix.com/jcenter" }
63+
64+
maven {
65+
url "https://packages.rnd.mendix.com/jcenter"
66+
}
7567

7668
// Build all modules with Android 16KB pages enabled
7769
plugins.withId('com.android.application') {
@@ -100,4 +92,34 @@ allprojects {
10092
}
10193
}
10294

95+
// Clean up phase: remove auto-added repositories and re-add JitPack correctly
96+
afterEvaluate { project ->
97+
def jitpackRemoved = false
98+
99+
project.repositories.removeAll { repo ->
100+
def repoUrl = repo.url.toString()
101+
102+
// Remove deprecated JCenter
103+
if (repoUrl.contains("jcenter.bintray.com")) {
104+
return true
105+
}
106+
107+
// Remove auto-added JitPack (re-added below)
108+
if (repoUrl.contains("jitpack.io")) {
109+
jitpackRemoved = true
110+
return true
111+
}
112+
113+
return false
114+
}
115+
116+
if (jitpackRemoved) {
117+
project.repositories {
118+
maven {
119+
url "https://www.jitpack.io"
120+
}
121+
}
122+
}
123+
124+
}
103125
apply plugin: "com.facebook.react.rootproject"

ios/Podfile.lock

Lines changed: 51 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ PODS:
7474
- ReactCommon/turbomodule/bridging
7575
- ReactCommon/turbomodule/core
7676
- Yoga
77-
- OpenSSL-Universal (3.3.3001)
77+
- OpenSSL-Universal (3.6.2000)
7878
- RCT-Folly (2024.11.18.00):
7979
- boost
8080
- DoubleConversion
@@ -1983,11 +1983,49 @@ PODS:
19831983
- ReactCommon/turbomodule/bridging
19841984
- ReactCommon/turbomodule/core
19851985
- Yoga
1986-
- RNNotifee (9.1.8):
1986+
- RNNotifee (10.4.7):
1987+
- DoubleConversion
1988+
- glog
1989+
- hermes-engine
1990+
- RCT-Folly (= 2024.11.18.00)
1991+
- RCTRequired
1992+
- RCTTypeSafety
19871993
- React-Core
1988-
- RNNotifee/NotifeeCore (= 9.1.8)
1989-
- RNNotifee/NotifeeCore (9.1.8):
1994+
- React-debug
1995+
- React-Fabric
1996+
- React-featureflags
1997+
- React-graphics
1998+
- React-ImageManager
1999+
- React-NativeModulesApple
2000+
- React-RCTFabric
2001+
- React-rendererdebug
2002+
- React-utils
2003+
- ReactCodegen
2004+
- ReactCommon/turbomodule/bridging
2005+
- ReactCommon/turbomodule/core
2006+
- RNNotifee/NotifeeCore (= 10.4.7)
2007+
- Yoga
2008+
- RNNotifee/NotifeeCore (10.4.7):
2009+
- DoubleConversion
2010+
- glog
2011+
- hermes-engine
2012+
- RCT-Folly (= 2024.11.18.00)
2013+
- RCTRequired
2014+
- RCTTypeSafety
19902015
- React-Core
2016+
- React-debug
2017+
- React-Fabric
2018+
- React-featureflags
2019+
- React-graphics
2020+
- React-ImageManager
2021+
- React-NativeModulesApple
2022+
- React-RCTFabric
2023+
- React-rendererdebug
2024+
- React-utils
2025+
- ReactCodegen
2026+
- ReactCommon/turbomodule/bridging
2027+
- ReactCommon/turbomodule/core
2028+
- Yoga
19912029
- RNPermissions (5.4.2):
19922030
- DoubleConversion
19932031
- glog
@@ -2237,9 +2275,9 @@ PODS:
22372275
- ReactCommon/turbomodule/bridging
22382276
- ReactCommon/turbomodule/core
22392277
- Yoga
2240-
- SDWebImage (5.21.5):
2241-
- SDWebImage/Core (= 5.21.5)
2242-
- SDWebImage/Core (5.21.5)
2278+
- SDWebImage (5.21.7):
2279+
- SDWebImage/Core (= 5.21.7)
2280+
- SDWebImage/Core (5.21.7)
22432281
- SDWebImageAVIFCoder (0.11.1):
22442282
- libavif/core (>= 0.11.0)
22452283
- SDWebImage (~> 5.10)
@@ -2335,7 +2373,7 @@ DEPENDENCIES:
23352373
- "RNFastImage (from `../node_modules/@d11/react-native-fast-image`)"
23362374
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
23372375
- RNLocalize (from `../node_modules/react-native-localize`)
2338-
- "RNNotifee (from `../node_modules/@notifee/react-native`)"
2376+
- RNNotifee (from `../node_modules/react-native-notify-kit`)
23392377
- RNPermissions (from `../node_modules/react-native-permissions`)
23402378
- RNReanimated (from `../node_modules/react-native-reanimated`)
23412379
- RNScreens (from `../node_modules/react-native-screens`)
@@ -2522,7 +2560,7 @@ EXTERNAL SOURCES:
25222560
RNLocalize:
25232561
:path: "../node_modules/react-native-localize"
25242562
RNNotifee:
2525-
:path: "../node_modules/@notifee/react-native"
2563+
:path: "../node_modules/react-native-notify-kit"
25262564
RNPermissions:
25272565
:path: "../node_modules/react-native-permissions"
25282566
RNReanimated:
@@ -2550,7 +2588,7 @@ SPEC CHECKSUMS:
25502588
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
25512589
MendixNative: 0a3caf6245eb2932bf109c2e7af213c8ff959679
25522590
op-sqlite: 12554de3e1a0cb86cbad3cf1f0c50450f57d3855
2553-
OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2
2591+
OpenSSL-Universal: ecee7b138fa75a74ecf00d7ffd248fb584739b9e
25542592
RCT-Folly: 46b84c7990d4a373ccef77134c23c763ba5cf3a0
25552593
RCTDeprecation: be794de7dc6ed8f9f7fbf525f86e7651b8b68746
25562594
RCTRequired: a83787b092ec554c2eb6019ff3f5b8d125472b3b
@@ -2623,13 +2661,13 @@ SPEC CHECKSUMS:
26232661
RNFastImage: f24b249b591b90e1a302527bb4ff2ed18ba5a8c8
26242662
RNGestureHandler: dcb1b1db024f3744b03af56d132f4f72c4c27195
26252663
RNLocalize: 22c9512d077379783fb41a4b47761ebe7cf87265
2626-
RNNotifee: 5e3b271e8ea7456a36eec994085543c9adca9168
2664+
RNNotifee: 02fa7727b82e30d37cebacd17ccdf27effe47778
26272665
RNPermissions: 018ae375862508798061fb385dc123d13988623d
26282666
RNReanimated: 505a98a0122d5e3bbeb0fb91e93dfb67d8112b84
26292667
RNScreens: 0d4cb9afe052607ad0aa71f645a88bb7c7f2e64c
26302668
RNSVG: 8ad5c94593e5e4a6e133e6934e2188e3c688d27a
26312669
RNVectorIcons: bd818296a51dc2bb8c3bd97a3ca399df1afe216d
2632-
SDWebImage: e9c98383c7572d713c1a0d7dd2783b10599b9838
2670+
SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
26332671
SDWebImageAVIFCoder: afe194a084e851f70228e4be35ef651df0fc5c57
26342672
SDWebImageWebPCoder: 0e06e365080397465cc73a7a9b472d8a3bd0f377
26352673
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
@@ -2638,4 +2676,4 @@ SPEC CHECKSUMS:
26382676

26392677
PODFILE CHECKSUM: e265124740c7e8d3ce93ef970c87f247433e1c66
26402678

2641-
COCOAPODS: 1.16.2
2679+
COCOAPODS: 1.17.0

0 commit comments

Comments
 (0)