@iternio/react-native-auto-play 0.3.2 → 0.3.3

package/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:8.13.0"
+    classpath "com.android.tools.build:gradle:8.13.2"
   }
 }
 
@@ -14,18 +14,11 @@ def reactNativeArchitectures() {
   return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
 apply plugin: "com.android.library"
 apply plugin: 'org.jetbrains.kotlin.android'
 apply from: '../nitrogen/generated/android/ReactNativeAutoPlay+autolinking.gradle'
 apply from: "./fix-prefab.gradle"
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
+apply plugin: "com.facebook.react"
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["ReactNativeAutoPlay_" + name]
@@ -117,12 +110,10 @@ android {
 
   sourceSets {
     main {
-      if (isNewArchitectureEnabled()) {
-        java.srcDirs += [
-          // React Codegen files
-          "${project.buildDir}/generated/source/codegen/java"
-        ]
-      }
+      java.srcDirs += [
+        // React Codegen files
+        "${project.buildDir}/generated/source/codegen/java"
+      ]
 
       if (getExtOrDefault("isAutomotiveApp") == "true") {
         java.srcDirs += 'src/automotive/java'
@@ -163,6 +154,6 @@ dependencies {
   }
 
   implementation 'com.google.android.gms:play-services-base:18.10.0'
-  implementation 'com.google.android.gms:play-services-auth:21.5.0'
+  implementation 'com.google.android.gms:play-services-auth:21.5.1'
 }
 

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidAutoService.kt

@@ -11,6 +11,7 @@ import android.content.ServiceConnection
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
+import android.os.Build
 import android.os.IBinder
 import android.util.Log
 import androidx.car.app.CarAppService
@@ -61,11 +62,13 @@ class AndroidAutoService : CarAppService() {
         notificationManager = getSystemService(NotificationManager::class.java)
         val appLabel = AppInfo.getApplicationLabel(this)
 
-        getSystemService(NotificationManager::class.java).createNotificationChannel(
-            NotificationChannel(
-                CHANNEL_ID, appLabel, NotificationManager.IMPORTANCE_DEFAULT
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            getSystemService(NotificationManager::class.java).createNotificationChannel(
+                NotificationChannel(
+                    CHANNEL_ID, appLabel, NotificationManager.IMPORTANCE_DEFAULT
+                )
             )
-        )
+        }
     }
 
     override fun onCreateSession(sessionInfo: SessionInfo): Session {

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/utils/ReactContextResolver.kt

@@ -2,59 +2,35 @@ package com.margelo.nitro.swe.iternio.reactnativeautoplay.utils
 
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactInstanceEventListener
-import com.facebook.react.ReactInstanceManager
 import com.facebook.react.bridge.ReactContext
-import com.margelo.nitro.BuildConfig
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
 
 object ReactContextResolver {
     suspend fun getReactContext(application: ReactApplication): ReactContext {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            val host =
-                application.reactHost ?: throw IllegalArgumentException("application host null")
-            return suspendCancellableCoroutine { continuation ->
-                host.currentReactContext?.let {
-                    continuation.resume(it)
-                    return@suspendCancellableCoroutine
-                }
-
-                val listener = object : ReactInstanceEventListener {
-                    override fun onReactContextInitialized(context: ReactContext) {
-                        host.removeReactInstanceEventListener(this)
-                        continuation.resume(context)
-                    }
-                }
-                host.addReactInstanceEventListener(listener)
+        val host =
+            application.reactHost ?: throw IllegalArgumentException("application host null")
 
-                continuation.invokeOnCancellation {
-                    host.removeReactInstanceEventListener(listener)
-                }
-
-                host.start()
+        return suspendCancellableCoroutine { continuation ->
+            host.currentReactContext?.let {
+                continuation.resume(it)
+                return@suspendCancellableCoroutine
             }
-        } else {
-            val reactInstanceManager = application.reactNativeHost.reactInstanceManager
-            return suspendCancellableCoroutine { continuation ->
-                reactInstanceManager.currentReactContext?.let {
-                    continuation.resume(it)
-                    return@suspendCancellableCoroutine
-                }
 
-                val listener = object : ReactInstanceManager.ReactInstanceEventListener {
-                    override fun onReactContextInitialized(context: ReactContext) {
-                        reactInstanceManager.removeReactInstanceEventListener(this)
-                        continuation.resume(context)
-                    }
-                }
-                reactInstanceManager.addReactInstanceEventListener(listener)
-
-                continuation.invokeOnCancellation {
-                    reactInstanceManager.removeReactInstanceEventListener(listener)
+            val listener = object : ReactInstanceEventListener {
+                override fun onReactContextInitialized(context: ReactContext) {
+                    host.removeReactInstanceEventListener(this)
+                    continuation.resume(context)
                 }
+            }
+            host.addReactInstanceEventListener(listener)
 
-                reactInstanceManager.createReactContextInBackground()
+            continuation.invokeOnCancellation {
+                host.removeReactInstanceEventListener(listener)
             }
+
+            host.start()
         }
+
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iternio/react-native-auto-play",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",