[MOO-2325] Fix for patched native lib and gradle repo order

android/build.gradle

@@ -58,24 +58,24 @@ project.ext {
 
 allprojects {
     repositories {
-        all { repo ->
-            println repo.url.toString()
-            if (repo.url.toString().contains("jcenter.bintray.com") || repo.url.toString().contains("jitpack.io")) {
-                project.logger.warn "Repository ${repo.url} removed."
-                remove repo
-                google()
-                mavenCentral()
-            }
-        }
+        google()
+        mavenCentral()
+
+        // Notifee local libs - ONLY for app.notifee
         maven {
             url "$rootDir/../node_modules/@notifee/react-native/android/libs"
+            content {
+                includeGroup "app.notifee"
+            }
         }
-        google()
+
         maven {
             url "https://maven.fabric.io/public"
         }
-        maven { url "https://www.jitpack.io" }
-        maven { url "https://packages.rnd.mendix.com/jcenter" }
+
+        maven {
+            url "https://packages.rnd.mendix.com/jcenter"
+        }
 
         // Build all modules with Android 16KB pages enabled
         plugins.withId('com.android.application') {
@@ -104,4 +104,35 @@ allprojects {
     }
 }
 
+// Clean up phase: remove auto-added repositories and re-add JitPack correctly
+afterEvaluate { project ->
+    def jitpackRemoved = false
+
+    project.repositories.removeAll { repo ->
+        def repoUrl = repo.url.toString()
+
+        // Remove deprecated JCenter
+        if (repoUrl.contains("jcenter.bintray.com")) {
+            return true
+        }
+
+        // Remove auto-added JitPack (re-added below)
+        if (repoUrl.contains("jitpack.io")) {
+            jitpackRemoved = true
+            return true
+        }
+
+        return false
+    }
+
+    if (jitpackRemoved) {
+        project.repositories {
+            maven {
+                url "https://www.jitpack.io"
+            }
+        }
+    }
+
+}
+
 apply plugin: "com.facebook.react.rootproject"

package.json

@@ -42,6 +42,7 @@
     "@react-native-vector-icons/get-image": "12.3.0",
     "@react-native-vector-icons/material-icons": "12.4.1",
     "react-native-video": "6.19.2",
+    "react-native-track-player": "4.1.2",
     "semver": "7.7.4"
   },
   "devDependencies": {

patches/react-native-track-player+4.1.2.patch

@@ -0,0 +1,28 @@
+diff --git a/node_modules/react-native-track-player/android/src/main/java/com/doublesymmetry/trackplayer/module/MusicModule.kt b/node_modules/react-native-track-player/android/src/main/java/com/doublesymmetry/trackplayer/module/MusicModule.kt
+index b2409a09939164c49c0f7a16bb6d3284e8eab8fb..699a6e4f4e2652eca69cd1d3a522c21971fee1b4 100644
+--- a/node_modules/react-native-track-player/android/src/main/java/com/doublesymmetry/trackplayer/module/MusicModule.kt
++++ b/node_modules/react-native-track-player/android/src/main/java/com/doublesymmetry/trackplayer/module/MusicModule.kt
+@@ -545,7 +545,7 @@ class MusicModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaM
+         if (verifyServiceBoundOrReject(callback)) return@launch
+
+         if (index >= 0 && index < musicService.tracks.size) {
+-            callback.resolve(Arguments.fromBundle(musicService.tracks[index].originalItem))
++            callback.resolve(musicService.tracks[index].originalItem?.let { Arguments.fromBundle(it) })
+         } else {
+             callback.resolve(null)
+         }
+@@ -584,9 +584,11 @@ class MusicModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaM
+         if (verifyServiceBoundOrReject(callback)) return@launch
+         callback.resolve(
+             if (musicService.tracks.isEmpty()) null
+-            else Arguments.fromBundle(
+-                musicService.tracks[musicService.getCurrentTrackIndex()].originalItem
+-            )
++            else musicService.tracks[musicService.getCurrentTrackIndex()].originalItem?.let {
++                Arguments.fromBundle(
++                    it
++                )
++            }
+         )
+     }
+

stale_files

@@ -1,8 +1,6 @@
 patches/@op-engineering+op-sqlite+12.0.2.patch
 patches/react-native+0.77.3.patch
 patches/react-native-screens+4.6.0.patch
-patches/react-native+0.83.4.patch
-patches/react-native-gesture-handler+2.30.0.patch
 mendix-native-10.2.2.tgz
 ios/AppDelegate.h
 ios/AppDelegate.m
@@ -15,5 +13,4 @@ ios/SplashScreenPresenter.m
 ios/StoryBoardSplash.m
 ios/SwiftInterop.swift
 ios/Dev/AppDelegate.h
-ios/Dev/AppDelegate.m
-ios/Dev/MendixApp/MendixReactWindowExtensions.swift
+ios/Dev/AppDelegate.m