upgrade fcm (#58)

Author: wenxi-zeng

build.gradle

@@ -15,7 +15,7 @@ buildscript {
         classpath("de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'com.google.gms:google-services:4.3.5'
+        classpath 'com.google.gms:google-services:4.3.10'
 
         // For jitpack publishing of android library
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'

samples/kotlin-android-app/build.gradle

@@ -12,7 +12,7 @@ android {
     defaultConfig {
         multiDexEnabled true
         applicationId "com.segment.analytics.next"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 30
         versionCode 3
         versionName "2.0"
@@ -56,9 +56,10 @@ dependencies {
 
     implementation 'com.google.android.gms:play-services-ads:20.0.0'
 
-    implementation platform('com.google.firebase:firebase-bom:27.1.0')
+    implementation platform('com.google.firebase:firebase-bom:29.0.0')
+    implementation 'com.google.firebase:firebase-messaging-ktx'
     implementation 'com.google.firebase:firebase-analytics-ktx'
-    implementation 'com.google.firebase:firebase-messaging:19.0.0'
+
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

samples/kotlin-android-app/src/main/java/com/segment/analytics/next/MyFirebaseService.kt

@@ -8,8 +8,6 @@ import android.media.AudioAttributes
 import android.os.Build
 import android.util.Log
 import androidx.core.app.NotificationCompat
-import com.google.android.gms.tasks.OnCompleteListener
-import com.google.firebase.iid.FirebaseInstanceId
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import kotlinx.serialization.json.buildJsonObject
@@ -19,19 +17,8 @@ class MyFirebaseService : FirebaseMessagingService() {
 
     val TAG = "MyFirebaseService"
 
-    override fun onNewToken(s: String) {
-        Log.e(TAG, s)
-        FirebaseInstanceId.getInstance().instanceId
-            .addOnCompleteListener(OnCompleteListener { task ->
-                if (!task.isSuccessful) {
-                    Log.w(TAG, "getInstanceId failed", task.exception)
-                    return@OnCompleteListener
-                }
-
-                // Get new Instance ID token
-                val token = task.result.token
-                Log.e(TAG, token)
-            })
+    override fun onNewToken(token: String) {
+        Log.e(TAG, token)
     }
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {