Skip to content

Commit

Permalink
gradle updated.
Browse files Browse the repository at this point in the history
  • Loading branch information
iammert committed May 2, 2016
1 parent 89a2e12 commit 70ff597
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 14 deletions.
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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')
}
36 changes: 35 additions & 1 deletion app/google-services.json
Original file line number Diff line number Diff line change
@@ -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"}
{
"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"
}
1 change: 1 addition & 0 deletions app/src/main/java/co/mobiwise/gcmexample/GCMTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ protected void onCreate(Bundle savedInstanceState) {

@Override
public void onDeviceRegisted(String deviceToken) {
Log.v("TEST",deviceToken);
GCMManager.getInstance(this).subscribeTopic("aqa");
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions fastgcm/build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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'
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 70ff597

Please sign in to comment.