diff --git a/app/build.gradle b/app/build.gradle index 51e407d..e9f6dbf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion compileAndTargetSdkVersion - buildToolsVersion '28.0.3' + buildToolsVersion '29.0.0' defaultConfig { applicationId "com.example.fcm" @@ -36,11 +36,11 @@ android { } dependencies { - implementation("com.android.support:appcompat-v7:$supportLibraryVersion") { + implementation('androidx.appcompat:appcompat:1.0.0') { force = true } - implementation 'com.google.firebase:firebase-core:16.0.9' - implementation 'com.google.firebase:firebase-messaging:18.0.0' + implementation 'com.google.firebase:firebase-core:17.0.0' + implementation 'com.google.firebase:firebase-messaging:19.0.1' } apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/app/src/main/java/com/example/fcm/MyFirebaseMessagingService.java b/app/src/main/java/com/example/fcm/MyFirebaseMessagingService.java index 5b0e728..d797aa5 100644 --- a/app/src/main/java/com/example/fcm/MyFirebaseMessagingService.java +++ b/app/src/main/java/com/example/fcm/MyFirebaseMessagingService.java @@ -12,7 +12,7 @@ import android.graphics.Color; import android.media.RingtoneManager; import android.os.Build; import android.os.Bundle; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import android.util.Log; import com.google.firebase.messaging.FirebaseMessagingService; diff --git a/app/src/main/java/com/example/fcm/SecondActivity.java b/app/src/main/java/com/example/fcm/SecondActivity.java index 54f4364..7e4494f 100644 --- a/app/src/main/java/com/example/fcm/SecondActivity.java +++ b/app/src/main/java/com/example/fcm/SecondActivity.java @@ -1,7 +1,7 @@ package com.example.fcm; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.widget.TextView; public class SecondActivity extends AppCompatActivity { diff --git a/build.gradle b/build.gradle index 9c2039a..1b22ce8 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.google.gms:google-services:4.2.0' } } @@ -21,6 +21,5 @@ task clean(type: Delete) { } ext { - supportLibraryVersion = '28.0.0' compileAndTargetSdkVersion = 28 } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file