diff --git a/NcmbFcmPlugin/build.gradle b/NcmbFcmPlugin/build.gradle index c7ae573f..cd501fbd 100644 --- a/NcmbFcmPlugin/build.gradle +++ b/NcmbFcmPlugin/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/NcmbFcmPlugin/gradle/wrapper/gradle-wrapper.properties b/NcmbFcmPlugin/gradle/wrapper/gradle-wrapper.properties index fe82504d..0050d6ab 100644 --- a/NcmbFcmPlugin/gradle/wrapper/gradle-wrapper.properties +++ b/NcmbFcmPlugin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Nov 06 12:31:10 JST 2015 +#Thu Sep 12 15:10:05 ICT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/NcmbFcmPlugin/ncmbfcmplugin/build.gradle b/NcmbFcmPlugin/ncmbfcmplugin/build.gradle index 6ff9dd97..a5a94fb6 100644 --- a/NcmbFcmPlugin/ncmbfcmplugin/build.gradle +++ b/NcmbFcmPlugin/ncmbfcmplugin/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 14 @@ -24,10 +24,11 @@ repositories { } dependencies { - compileOnly fileTree(include: ['*.jar'], dir: '../libs') - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.google.firebase:firebase-messaging:17.1.0' - implementation 'com.google.android.gms:play-services-base:15.0.1' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'com.google.firebase:firebase-messaging:20.0.0' + implementation 'com.google.android.gms:play-services-base:17.0.0' + compileOnly fileTree(dir: 'src/libs', include: ['*.aar', '*.jar'], exclude: []) } android.libraryVariants.all { variant -> diff --git a/NcmbFcmPlugin/ncmbfcmplugin/release/ncmbfcmplugin.aar b/NcmbFcmPlugin/ncmbfcmplugin/release/ncmbfcmplugin.aar index 23c4cc47..3ba3c1c6 100644 Binary files a/NcmbFcmPlugin/ncmbfcmplugin/release/ncmbfcmplugin.aar and b/NcmbFcmPlugin/ncmbfcmplugin/release/ncmbfcmplugin.aar differ diff --git a/NcmbFcmPlugin/ncmbfcmplugin/src/main/java/com/nifcloud/mbaas/ncmbfcmplugin/FCMInit.java b/NcmbFcmPlugin/ncmbfcmplugin/src/main/java/com/nifcloud/mbaas/ncmbfcmplugin/FCMInit.java index 4e547bef..c7acc91b 100644 --- a/NcmbFcmPlugin/ncmbfcmplugin/src/main/java/com/nifcloud/mbaas/ncmbfcmplugin/FCMInit.java +++ b/NcmbFcmPlugin/ncmbfcmplugin/src/main/java/com/nifcloud/mbaas/ncmbfcmplugin/FCMInit.java @@ -20,9 +20,10 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Build; -import android.support.annotation.NonNull; import android.util.Log; +import androidx.annotation.NonNull; + import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; import com.google.android.gms.tasks.OnCanceledListener; diff --git a/NcmbFcmPlugin/ncmbfcmplugin/src/main/java/com/nifcloud/mbaas/ncmbfcmplugin/NCMBFirebaseMessagingService.java b/NcmbFcmPlugin/ncmbfcmplugin/src/main/java/com/nifcloud/mbaas/ncmbfcmplugin/NCMBFirebaseMessagingService.java index 6a50f9b9..97b40d28 100755 --- a/NcmbFcmPlugin/ncmbfcmplugin/src/main/java/com/nifcloud/mbaas/ncmbfcmplugin/NCMBFirebaseMessagingService.java +++ b/NcmbFcmPlugin/ncmbfcmplugin/src/main/java/com/nifcloud/mbaas/ncmbfcmplugin/NCMBFirebaseMessagingService.java @@ -25,9 +25,10 @@ import android.media.RingtoneManager; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.NotificationCompat; import android.util.Log; +import androidx.core.app.NotificationCompat; + import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; import com.unity3d.player.UnityPlayer; diff --git a/ncmb_unity/Assets/Plugins/Android/collection-1.1.0.jar b/ncmb_unity/Assets/Plugins/Android/collection-1.1.0.jar new file mode 100644 index 00000000..761fe3bf Binary files /dev/null and b/ncmb_unity/Assets/Plugins/Android/collection-1.1.0.jar differ diff --git a/ncmb_unity/Assets/Plugins/Android/core-1.1.0.aar b/ncmb_unity/Assets/Plugins/Android/core-1.1.0.aar new file mode 100644 index 00000000..01c83a3e Binary files /dev/null and b/ncmb_unity/Assets/Plugins/Android/core-1.1.0.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/firebase-analytics-impl-16.0.0.aar b/ncmb_unity/Assets/Plugins/Android/firebase-analytics-impl-16.0.0.aar deleted file mode 100644 index fbc96d0c..00000000 Binary files a/ncmb_unity/Assets/Plugins/Android/firebase-analytics-impl-16.0.0.aar and /dev/null differ diff --git a/ncmb_unity/Assets/Plugins/Android/firebase-common-16.0.0.aar b/ncmb_unity/Assets/Plugins/Android/firebase-common-16.0.0.aar deleted file mode 100644 index 39b09176..00000000 Binary files a/ncmb_unity/Assets/Plugins/Android/firebase-common-16.0.0.aar and /dev/null differ diff --git a/ncmb_unity/Assets/Plugins/Android/firebase-common-19.1.0.aar b/ncmb_unity/Assets/Plugins/Android/firebase-common-19.1.0.aar new file mode 100644 index 00000000..20876c0b Binary files /dev/null and b/ncmb_unity/Assets/Plugins/Android/firebase-common-19.1.0.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/firebase-iid-16.2.0.aar b/ncmb_unity/Assets/Plugins/Android/firebase-iid-16.2.0.aar deleted file mode 100644 index 862b9cee..00000000 Binary files a/ncmb_unity/Assets/Plugins/Android/firebase-iid-16.2.0.aar and /dev/null differ diff --git a/ncmb_unity/Assets/Plugins/Android/firebase-iid-20.0.0.aar b/ncmb_unity/Assets/Plugins/Android/firebase-iid-20.0.0.aar new file mode 100644 index 00000000..27343a62 Binary files /dev/null and b/ncmb_unity/Assets/Plugins/Android/firebase-iid-20.0.0.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/firebase-iid-interop-16.0.0.aar b/ncmb_unity/Assets/Plugins/Android/firebase-iid-interop-17.0.0.aar similarity index 79% rename from ncmb_unity/Assets/Plugins/Android/firebase-iid-interop-16.0.0.aar rename to ncmb_unity/Assets/Plugins/Android/firebase-iid-interop-17.0.0.aar index d757daaa..c728e6db 100644 Binary files a/ncmb_unity/Assets/Plugins/Android/firebase-iid-interop-16.0.0.aar and b/ncmb_unity/Assets/Plugins/Android/firebase-iid-interop-17.0.0.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/firebase-measurement-connector-18.0.0.aar b/ncmb_unity/Assets/Plugins/Android/firebase-measurement-connector-18.0.0.aar new file mode 100644 index 00000000..f94e3d1b Binary files /dev/null and b/ncmb_unity/Assets/Plugins/Android/firebase-measurement-connector-18.0.0.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/firebase-messaging-17.1.0.aar b/ncmb_unity/Assets/Plugins/Android/firebase-messaging-17.1.0.aar deleted file mode 100644 index 384f59ac..00000000 Binary files a/ncmb_unity/Assets/Plugins/Android/firebase-messaging-17.1.0.aar and /dev/null differ diff --git a/ncmb_unity/Assets/Plugins/Android/firebase-messaging-20.0.0.aar b/ncmb_unity/Assets/Plugins/Android/firebase-messaging-20.0.0.aar new file mode 100644 index 00000000..bb86d5cc Binary files /dev/null and b/ncmb_unity/Assets/Plugins/Android/firebase-messaging-20.0.0.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/legacy-support-core-utils-1.0.0.aar b/ncmb_unity/Assets/Plugins/Android/legacy-support-core-utils-1.0.0.aar new file mode 100644 index 00000000..2980f603 Binary files /dev/null and b/ncmb_unity/Assets/Plugins/Android/legacy-support-core-utils-1.0.0.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/legacy-support-v4-1.0.0.aar b/ncmb_unity/Assets/Plugins/Android/legacy-support-v4-1.0.0.aar new file mode 100644 index 00000000..bc64a974 Binary files /dev/null and b/ncmb_unity/Assets/Plugins/Android/legacy-support-v4-1.0.0.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/ncmbfcmplugin.aar b/ncmb_unity/Assets/Plugins/Android/ncmbfcmplugin.aar index 23c4cc47..3ba3c1c6 100644 Binary files a/ncmb_unity/Assets/Plugins/Android/ncmbfcmplugin.aar and b/ncmb_unity/Assets/Plugins/Android/ncmbfcmplugin.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/play-services-base-15.0.1.aar b/ncmb_unity/Assets/Plugins/Android/play-services-base-15.0.1.aar deleted file mode 100644 index b1dbf35c..00000000 Binary files a/ncmb_unity/Assets/Plugins/Android/play-services-base-15.0.1.aar and /dev/null differ diff --git a/ncmb_unity/Assets/Plugins/Android/play-services-base-17.0.0.aar b/ncmb_unity/Assets/Plugins/Android/play-services-base-17.0.0.aar new file mode 100644 index 00000000..9499f9b5 Binary files /dev/null and b/ncmb_unity/Assets/Plugins/Android/play-services-base-17.0.0.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/play-services-basement-15.0.1.aar b/ncmb_unity/Assets/Plugins/Android/play-services-basement-15.0.1.aar deleted file mode 100644 index 20a42f28..00000000 Binary files a/ncmb_unity/Assets/Plugins/Android/play-services-basement-15.0.1.aar and /dev/null differ diff --git a/ncmb_unity/Assets/Plugins/Android/play-services-basement-17.1.1.aar b/ncmb_unity/Assets/Plugins/Android/play-services-basement-17.1.1.aar new file mode 100644 index 00000000..8022495b Binary files /dev/null and b/ncmb_unity/Assets/Plugins/Android/play-services-basement-17.1.1.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/play-services-measurement-base-15.0.0.aar b/ncmb_unity/Assets/Plugins/Android/play-services-measurement-base-15.0.0.aar deleted file mode 100644 index 922c26c6..00000000 Binary files a/ncmb_unity/Assets/Plugins/Android/play-services-measurement-base-15.0.0.aar and /dev/null differ diff --git a/ncmb_unity/Assets/Plugins/Android/play-services-tasks-15.0.1.aar b/ncmb_unity/Assets/Plugins/Android/play-services-tasks-15.0.1.aar deleted file mode 100644 index e10066cc..00000000 Binary files a/ncmb_unity/Assets/Plugins/Android/play-services-tasks-15.0.1.aar and /dev/null differ diff --git a/ncmb_unity/Assets/Plugins/Android/play-services-tasks-17.0.0.aar b/ncmb_unity/Assets/Plugins/Android/play-services-tasks-17.0.0.aar new file mode 100644 index 00000000..c58fbfb3 Binary files /dev/null and b/ncmb_unity/Assets/Plugins/Android/play-services-tasks-17.0.0.aar differ diff --git a/ncmb_unity/Assets/Plugins/Android/support-compat-26.0.2.aar b/ncmb_unity/Assets/Plugins/Android/support-compat-26.0.2.aar deleted file mode 100644 index 739c7b04..00000000 Binary files a/ncmb_unity/Assets/Plugins/Android/support-compat-26.0.2.aar and /dev/null differ diff --git a/ncmb_unity/Assets/Plugins/Android/support-core-utils-26.0.2.aar b/ncmb_unity/Assets/Plugins/Android/support-core-utils-26.0.2.aar deleted file mode 100644 index b377cea8..00000000 Binary files a/ncmb_unity/Assets/Plugins/Android/support-core-utils-26.0.2.aar and /dev/null differ diff --git a/ncmb_unity/Assets/Plugins/Android/support-v4-26.0.2.aar b/ncmb_unity/Assets/Plugins/Android/support-v4-26.0.2.aar deleted file mode 100644 index d00371a3..00000000 Binary files a/ncmb_unity/Assets/Plugins/Android/support-v4-26.0.2.aar and /dev/null differ