diff options
author | Roman Nurik <roman@nurik.net> | 2015-01-07 10:02:53 -0500 |
---|---|---|
committer | Roman Nurik <roman@nurik.net> | 2015-01-07 10:02:53 -0500 |
commit | 3dd9e15b0641adc415035af07c8cae9d780a2091 (patch) | |
tree | 18c57c0346caf7d710de6aae6121b38d51b246ca | |
parent | b8b238fbec47b329833cbdb2a5fc01b253d3ca15 (diff) | |
parent | 267819b001f56671c558c949eb1d4b4c8d7d5de8 (diff) | |
download | iosched-3dd9e15b0641adc415035af07c8cae9d780a2091.tar.gz |
Merge pull request #110 from romannurik/master
Merge a change based on rock3r's recommendation
-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:+' } |