diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-03-24 19:30:57 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-03-24 19:30:57 -0400 |
| commit | d378c599bc984b68641a088b8def587ee1870918 (patch) | |
| tree | 5f951206b71ff6b338cace5a633a64286a1ec5bc /app | |
| parent | d280a32c23b3a302888e1f6f0636a8116709dc95 (diff) | |
| parent | e63e0a4f1c5fb83048bee06916ec001f858626e3 (diff) | |
| download | AntennaPod-d378c599bc984b68641a088b8def587ee1870918.zip | |
Merge pull request #687 from mfietz/dslv-integrate
Integration of DSLV and fling adjustments
Diffstat (limited to 'app')
| -rw-r--r-- | app/build.gradle | 2 | ||||
| m--------- | app/dslv | 0 | ||||
| -rw-r--r-- | app/settings.gradle | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle index 8f829d0af..b59106248 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,6 @@ dependencies { exclude group: 'org.json', module: 'json' } compile 'commons-io:commons-io:2.4' - compile project('dslv:library') compile 'com.jayway.android.robotium:robotium-solo:5.2.1' compile 'org.jsoup:jsoup:1.7.3' compile 'com.squareup.picasso:picasso:2.4.0' @@ -19,6 +18,7 @@ dependencies { compile 'com.squareup.okhttp:okhttp-urlconnection:2.2.0' compile 'com.squareup.okio:okio:1.2.0' compile project(':core') + compile project(':library:drag-sort-listview') } android { diff --git a/app/dslv b/app/dslv deleted file mode 160000 -Subproject 80011c50e444e1c7d5e13b57bdb127b524a1ff9 diff --git a/app/settings.gradle b/app/settings.gradle deleted file mode 100644 index e2d4f844d..000000000 --- a/app/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app:dslv:library' |