diff options
author | Scott Jackson <daneren2005@gmail.com> | 2016-07-26 22:08:28 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2016-07-26 22:08:28 -0700 |
commit | 6377612ce4a3d9de8509b53338f3c72cf8885d37 (patch) | |
tree | e93f2caf9bdfe72e32e2b917192b63fca2e831ab /app/build.gradle | |
parent | add777d1d1a2406f90a079ae2d78766c414171be (diff) | |
parent | aeb5cf0c40a177e6a4ecfbbf0f4e059618311242 (diff) | |
download | dsub-6377612ce4a3d9de8509b53338f3c72cf8885d37.tar.gz dsub-6377612ce4a3d9de8509b53338f3c72cf8885d37.tar.bz2 dsub-6377612ce4a3d9de8509b53338f3c72cf8885d37.zip |
Merge branch 'playback_speed'
Diffstat (limited to 'app/build.gradle')
-rw-r--r-- | app/build.gradle | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/build.gradle b/app/build.gradle index 292a151a..f5072c42 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,9 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 22 - buildToolsVersion "22.0.0" + compileSdkVersion 23 + buildToolsVersion "23.0.3" + useLibrary 'org.apache.http.legacy' defaultConfig { applicationId "github.daneren2005.dsub" @@ -42,11 +43,11 @@ android { dependencies { compile project(':Server Proxy') compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:support-v4:22.2.+' - compile 'com.android.support:appcompat-v7:22.2.+' - compile 'com.android.support:mediarouter-v7:22.2.+' - compile 'com.android.support:recyclerview-v7:22.2.+' - compile 'com.android.support:design:22.2.+' + compile 'com.android.support:support-v4:23.4.+' + compile 'com.android.support:appcompat-v7:23.4.+' + compile 'com.android.support:mediarouter-v7:23.4.+' + compile 'com.android.support:recyclerview-v7:23.4.+' + compile 'com.android.support:design:23.4.+' compile 'com.google.android.gms:play-services-cast:8.1.0' compile 'com.sothree.slidinguppanel:library:3.0.0' compile 'de.hdodenhof:circleimageview:1.2.1' |