diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-04-29 10:16:56 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-04-29 10:16:56 -0700 |
| commit | 80665e81bec1bee22b1d93d287aa0ca0e23d0079 (patch) | |
| tree | af24b87f5188bb08ccd93a0ed6b1113b87b95ab9 /app/build.gradle | |
| parent | 0f801b780e82943bde5b3e7d96af1c6b29ba4edc (diff) | |
| parent | 076d07c655656b6d8bc3e5e3f4e2f8aa3747dd2d (diff) | |
| download | dsub-80665e81bec1bee22b1d93d287aa0ca0e23d0079.tar.gz dsub-80665e81bec1bee22b1d93d287aa0ca0e23d0079.tar.bz2 dsub-80665e81bec1bee22b1d93d287aa0ca0e23d0079.zip | |
Merge branch 'master' into SlideUpPanel2
Conflicts:
app/app.iml
app/build.gradle
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle index 76381247..a3667828 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,14 +11,18 @@ android { } buildTypes { release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard.cfg') + minifyEnabled true + proguardFiles 'proguard.cfg' } } packagingOptions { exclude 'META-INF/beans.xml' } + + lintOptions { + checkReleaseBuilds false + } } dependencies { @@ -30,4 +34,9 @@ dependencies { compile 'com.android.support:mediarouter-v7:22.1.1' compile 'com.google.android.gms:play-services-cast:7.0.0' compile 'com.sothree.slidinguppanel:library:3.0.0' + compile group: 'org.fourthline.cling', name: 'cling-core', version:'2.0.1' + compile group: 'org.fourthline.cling', name: 'cling-support', version:'2.0.1' + compile group: 'org.eclipse.jetty', name: 'jetty-server', version:'8.1.16.v20140903' + compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version:'8.1.16.v20140903' + compile group: 'org.eclipse.jetty', name: 'jetty-client', version:'8.1.16.v20140903' } |