diff --git a/app/build.gradle b/app/build.gradle index 98d4d25..4c36a6a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,13 +2,13 @@ apply plugin: 'com.android.application' apply plugin: 'com.google.gms.google-services' android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + compileSdkVersion 23 + buildToolsVersion '23.0.1' defaultConfig { applicationId "co.mobiwise.gcmexample" minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 23 versionCode 1 versionName "1.0" } @@ -21,7 +21,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:22.2.0' + compile fileTree(include: ['*.jar'], dir: 'libs') + compile 'com.android.support:appcompat-v7:23.2.1' compile project(':fastgcm') } diff --git a/app/google-services.json b/app/google-services.json index 605e896..fde008a 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -1 +1,35 @@ -{"project_info":{"project_id":"fastgcm-7cfd4","project_number":"671708005937","name":"FastGCM"},"client":[{"client_info":{"client_id":"android:co.mobiwise.fastgcm","client_type":1,"android_client_info":{"package_name":"co.mobiwise.fastgcm"}},"oauth_client":[],"services":{"analytics_service":{"status":1},"cloud_messaging_service":{"status":2,"apns_config":[]},"appinvite_service":{"status":1,"other_platform_oauth_client":[]},"google_signin_service":{"status":1},"ads_service":{"status":1}}}],"ARTIFACT_VERSION":"1"} \ No newline at end of file +{ + "project_info": { + "project_number": "192931305794", + "project_id": "gcmexample-8223f" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:192931305794:android:1f8cd0ac30864393", + "android_client_info": { + "package_name": "co.mobiwise.gcmexample" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyDZj0kCZX-rLZ_xBs8BXerH-5gxsPmtLbQ" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 1, + "other_platform_oauth_client": [] + }, + "ads_service": { + "status": 1 + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/src/main/java/co/mobiwise/gcmexample/GCMTest.java b/app/src/main/java/co/mobiwise/gcmexample/GCMTest.java index 4358027..286d2a5 100644 --- a/app/src/main/java/co/mobiwise/gcmexample/GCMTest.java +++ b/app/src/main/java/co/mobiwise/gcmexample/GCMTest.java @@ -20,6 +20,7 @@ protected void onCreate(Bundle savedInstanceState) { @Override public void onDeviceRegisted(String deviceToken) { + Log.v("TEST",deviceToken); GCMManager.getInstance(this).subscribeTopic("aqa"); } diff --git a/build.gradle b/build.gradle index 20489e2..53701fe 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:1.2.3' - classpath 'com.google.gms:google-services:1.3.0-beta1' + classpath 'com.google.gms:google-services:2.0.0-alpha6' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/fastgcm/build.gradle b/fastgcm/build.gradle index 02a24c5..ed8287a 100644 --- a/fastgcm/build.gradle +++ b/fastgcm/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + compileSdkVersion 23 + buildToolsVersion '23.0.1' defaultConfig { versionCode 1 @@ -17,8 +17,6 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:22.2.0' - compile 'com.google.android.gms:play-services-base:7.5.0' - compile 'com.google.android.gms:play-services-gcm:7.5.0' + compile fileTree(include: ['*.jar'], dir: 'libs') + compile 'com.google.android.gms:play-services-gcm:8.4.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b41edbd..4bd368d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip