diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-08-07 12:07:37 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-08-07 12:07:39 +0200 |
| commit | dc81e0254cc1ea91e8553c39e53489998fe079d9 (patch) | |
| tree | b7ca0a8aaab524c5744841b467718a91f85b5fec | |
| parent | 3dbe0033dcf090b0c34f67c2f7440e3023eba060 (diff) | |
| download | open-keychain-dc81e0254cc1ea91e8553c39e53489998fe079d9.tar.gz open-keychain-dc81e0254cc1ea91e8553c39e53489998fe079d9.tar.bz2 open-keychain-dc81e0254cc1ea91e8553c39e53489998fe079d9.zip | |
use snackbar from repository (again), and update to 2.11.0
This release merged our pull requests for round corners on tablet for top line,
and nicer dismiss-on-swipe animation.
https://github.com/nispok/snackbar/pull/134
https://github.com/nispok/snackbar/pull/135
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | OpenKeychain/build.gradle | 3 | ||||
| m--------- | extern/snackbar | 0 | ||||
| -rw-r--r-- | settings.gradle | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index db9342d20..9d4e0f9dd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,6 +22,3 @@ path = extern/safeslinger-exchange url = https://github.com/open-keychain/exchange-android ignore = dirty -[submodule "extern/snackbar"] - path = extern/snackbar - url = https://github.com/open-keychain/snackbar diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index c74c63688..296a0a792 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -54,6 +54,7 @@ dependencies { compile 'com.mikepenz.iconics:octicons-typeface:2.2.0@aar' compile 'com.mikepenz.iconics:meteocons-typeface:1.1.1@aar' compile 'com.mikepenz.iconics:community-material-typeface:1.0.0@aar' + compile 'com.nispok:snackbar:2.11.0' compile 'com.squareup.okhttp:okhttp:2.4.0' // libs as submodules @@ -66,7 +67,6 @@ dependencies { compile project(':extern:minidns') compile project(':extern:KeybaseLib:Lib') compile project(':extern:safeslinger-exchange:safeslinger-exchange') - compile project(':extern:snackbar:lib') } // Output of ./gradlew -q calculateChecksums @@ -106,6 +106,7 @@ dependencyVerification { // 'OpenKeychain.extern.snackbar:lib:6847a73d2680558d35f0b384ac3ed006532c0a2306598b000db94ef18aab62aa', 'com.android.support:support-annotations:beac5cae60bdb597df9af9c916f785c2f71f8c8ae4be9a32d4298dea85496a42', 'com.squareup.okio:okio:b53c1760864e1c39b5275d9023e2a6fbe8f3189e6e67b4c87877b8ec8f92e05a', + 'com.nispok:snackbar:46b5eb9d630d329e13c2ce00ee9fb115ffb66c23c72cff32ee97eedd76824c6f', ] } diff --git a/extern/snackbar b/extern/snackbar deleted file mode 160000 -Subproject abd5c3eb4773e9f4454c22c204419b5f33096e9 diff --git a/settings.gradle b/settings.gradle index ec35f094e..863fd5541 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,4 +8,3 @@ include ':extern:spongycastle:prov' include ':extern:minidns' include ':extern:KeybaseLib:Lib' include ':extern:safeslinger-exchange:safeslinger-exchange' -include ':extern:snackbar:lib' |