diff options
| author | Roman Nurik <roman@nurik.net> | 2015-01-07 09:59:27 -0500 |
|---|---|---|
| committer | Roman Nurik <roman@nurik.net> | 2015-01-07 09:59:27 -0500 |
| commit | cca028043a82a3dbfd2125abb5b1dfff4d9c037f (patch) | |
| tree | 6fea7547f206134239e5ee2eda11ef7ee760dcfd | |
| parent | cf1f30b4c752f275518384a9b71404ee501fc473 (diff) | |
| parent | 5dc24d1bc08615f2cf7c2385a920a9025d6b4b15 (diff) | |
| download | iosched-cca028043a82a3dbfd2125abb5b1dfff4d9c037f.tar.gz | |
Merge branch 'Fix_PlayServices_update' of https://github.com/rock3r/iosched-2014 into foo
Conflicts:
Wearable/build.gradle
android/build.gradle
build.gradle
Change-Id: Ibc782be67875114498472895a527180a39b4b957
| -rw-r--r-- | Wearable/build.gradle | 2 | ||||
| -rw-r--r-- | android/build.gradle | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Wearable/build.gradle b/Wearable/build.gradle index 4b9d9bd..d893535 100644 --- a/Wearable/build.gradle +++ b/Wearable/build.gradle @@ -66,7 +66,7 @@ android { dependencies { compile 'com.android.support:support-v13:21.+' - compile 'com.google.android.support:wearable:+' + compile 'com.google.android.support:wearable:1.0.+' compile 'com.google.android.gms:play-services-wearable:6.1.+' } diff --git a/android/build.gradle b/android/build.gradle index f4e6d5a..6036db7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -96,6 +96,6 @@ dependencies { /* The two dependencies below are only required while we are using http Drive appdata. When we start using AppData through GMS, they should be removed. */ - compile 'com.google.http-client:google-http-client-gson:+' + compile 'com.google.http-client:google-http-client-gson:1.+' compile 'com.google.apis:google-api-services-drive:+' } |