Merge pull request #1982 from OneSignal/upgrade/play-services-basement

Upgrade play-services-basement to 18.1.0

Author: jkasten2

OneSignalSDK/onesignal/notifications/build.gradle

@@ -69,23 +69,13 @@ dependencies {
 
     compileOnly('com.amazon.device:amazon-appstore-sdk:[3.0.1, 3.0.99]')
 
-    // play-services-base:16.1.0 is the last version before going to AndroidX
-    // play-services-base:17.0.0 is the first version using AndroidX
-    // Required for GoogleApiAvailability
-    implementation('com.google.android.gms:play-services-base') {
-        version {
-            require '[17.0.0, 17.6.99]'
-            prefer '17.6.0'
-        }
-    }
-
     // firebase-messaging:18.0.0 is the last version before going to AndroidX
     // firebase-messaging:19.0.0 is the first version using AndroidX
     // firebase-messaging:23.0.0 incoporates fix for SecurityException: Not allowed to bind to service
     api('com.google.firebase:firebase-messaging') {
         version {
             require '[19.0.0, 23.0.99]'
-            prefer '23.0.0'
+            prefer '23.0.8'
         }
     }
 

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorAbstractGoogle.kt

@@ -34,6 +34,7 @@ import com.onesignal.notifications.internal.registration.IPushRegistrator
 import com.onesignal.user.internal.subscriptions.SubscriptionStatus
 import kotlinx.coroutines.delay
 import java.io.IOException
+import java.util.concurrent.ExecutionException
 
 /**
  * The abstract google push registration service.  It is expected [PushRegistratorFCM] will extend
@@ -47,7 +48,7 @@ internal abstract class PushRegistratorAbstractGoogle(
     IPushRegistrator, IPushRegistratorCallback {
     abstract val providerName: String
 
-    @Throws(Throwable::class)
+    @Throws(ExecutionException::class, InterruptedException::class, IOException::class)
     abstract suspend fun getToken(senderId: String): String
 
     override suspend fun registerForPush(): IPushRegistrator.RegisterResult {

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorFCM.kt

@@ -128,7 +128,7 @@ internal class PushRegistratorFCM(
                 try {
                     token = Tasks.await(tokenTask)
                 } catch (e: ExecutionException) {
-                    throw tokenTask.exception
+                    throw tokenTask.exception ?: e
                 }
             }