Merge pull request #1232 from mendix/moo/MOO-2325-add-patched-library

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

Author: YogendraShelke

android/app/build.gradle

@@ -55,6 +55,7 @@ apply plugin: 'org.jetbrains.kotlin.plugin.compose'
  * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
  */
 def enableProguardInReleaseBuilds = false
+def firebaseBomVersion = rootProject.ext['react-native']['versions']['firebase']['bom']
 
 android {
     ndkVersion rootProject.ndkVersion
@@ -112,6 +113,7 @@ android {
 
 dependencies {
     implementation "com.facebook.react:react-android"
+    implementation platform("com.google.firebase:firebase-bom:${firebaseBomVersion}")
 
     implementation "androidx.core:core-ktx:1.3.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"

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"

ios/Podfile.lock

@@ -2174,6 +2174,9 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
+  - react-native-track-player (4.1.2):
+    - React-Core
+    - SwiftAudioEx (= 1.1.0)
   - react-native-vector-icons (12.3.0):
     - boost
     - DoubleConversion
@@ -3394,6 +3397,7 @@ PODS:
     - SDWebImage/Core (~> 5.17)
   - SocketRocket (0.7.1)
   - SSZipArchive (2.6.0)
+  - SwiftAudioEx (1.1.0)
   - Yoga (0.0.0)
 
 DEPENDENCIES:
@@ -3449,6 +3453,7 @@ DEPENDENCIES:
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-pager-view (from `../node_modules/react-native-pager-view`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
+  - react-native-track-player (from `../node_modules/react-native-track-player`)
   - "react-native-vector-icons (from `../node_modules/@react-native-vector-icons/get-image`)"
   - "react-native-vector-icons-material-icons (from `../node_modules/@react-native-vector-icons/material-icons`)"
   - react-native-video (from `../node_modules/react-native-video`)
@@ -3516,6 +3521,7 @@ SPEC REPOS:
     - SDWebImageWebPCoder
     - SocketRocket
     - SSZipArchive
+    - SwiftAudioEx
 
 EXTERNAL SOURCES:
   boost:
@@ -3619,6 +3625,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-pager-view"
   react-native-safe-area-context:
     :path: "../node_modules/react-native-safe-area-context"
+  react-native-track-player:
+    :path: "../node_modules/react-native-track-player"
   react-native-vector-icons:
     :path: "../node_modules/@react-native-vector-icons/get-image"
   react-native-vector-icons-material-icons:
@@ -3778,6 +3786,7 @@ SPEC CHECKSUMS:
   react-native-image-picker: b16541b587b275e81a12f9b82f215c5e9b0ccbf3
   react-native-pager-view: a0516effb17ca5120ac2113bfd21b91130ad5748
   react-native-safe-area-context: befb5404eb8a16fdc07fa2bebab3568ecabcbb8a
+  react-native-track-player: dd56f9948e03756a217c75e0a61aa04aab65b5a1
   react-native-vector-icons: 6ba2060e1b82ce0663f14375579fe1d48e9b668a
   react-native-vector-icons-material-icons: 2fe75632937d07937bfe8ca953e1b5d06eef3a1d
   react-native-video: f8e9788554c53a1852166cd119d6e7c324b16dfe
@@ -3834,6 +3843,7 @@ SPEC CHECKSUMS:
   SDWebImageWebPCoder: 0e06e365080397465cc73a7a9b472d8a3bd0f377
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea
+  SwiftAudioEx: f6aa653770f3a0d3851edaf8d834a30aee4a7646
   Yoga: 447c8baf495b8d96457a46e6691a2c9952cbd07f
 
 PODFILE CHECKSUM: 007913bf46b5b3d85747fd4f0aea854dd063fbc2

package-lock.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": {

package.json

@@ -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
++                )
++            }
+         )
+     }
+