aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-05-10 03:39:19 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-05-10 03:39:19 +0200
commitbfc57aefa5d9fd435e93589ea8a37c9747cb7814 (patch)
tree6c79107b58de68cb6afee5caa14c8f023f9dc324
parente14a2efcaded63ee6d0946d46a605c858941e3ca (diff)
downloadopen-keychain-bfc57aefa5d9fd435e93589ea8a37c9747cb7814.zip
open-keychain-bfc57aefa5d9fd435e93589ea8a37c9747cb7814.tar.gz
open-keychain-bfc57aefa5d9fd435e93589ea8a37c9747cb7814.tar.bz2
Use snackbar lib from maven repo
-rw-r--r--.gitmodules3
-rw-r--r--OpenKeychain/build.gradle3
m---------extern/snackbar0
-rw-r--r--settings.gradle1
4 files changed, 2 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index db9342d..9d4e0f9 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 6ae8401..9ea637b 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -39,6 +39,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.10.8'
// libs as submodules
compile project(':extern:openpgp-api-lib:openpgp-api')
@@ -50,7 +51,6 @@ dependencies {
compile project(':extern:minidns')
compile project(':extern:KeybaseLib:Lib')
compile project(':extern:safeslinger-exchange')
- compile project(':extern:snackbar:lib')
}
// Output of ./gradlew -q calculateChecksums
@@ -76,6 +76,7 @@ dependencyVerification {
'com.mikepenz.iconics:octicons-typeface:67ed7d456a9ce5f5307b85f955797bfb3dd674e2f6defb31c6b8bbe2ede290be',
'com.mikepenz.iconics:meteocons-typeface:39a8a9e70cd8287cdb119af57a672a41dd09240dba6697f5a0dbda1ccc33298b',
'com.mikepenz.iconics:community-material-typeface:f1c5afee5f0f10d66beb3ed0df977246a02a9c46de4e05d7c0264bcde53b6b7f',
+ 'com.nispok:snackbar:80bebc8e5d8b3d728cd5f2336e2d0c1cc2a6b7dc4b55d36acd6b75a78265590a',
// 'OpenKeychain.extern:openpgp-api-lib:f05a9215cdad3a6597e4c5ece6fcec92b178d218195a3e88d2c0937c48dd9580',
// 'OpenKeychain.extern:openkeychain-api-lib:50f6ebb5452d3fdc7be137ccf857a0ff44d55539fcb7b91baef495766ed7f429',
// 'com.madgag.spongycastle:core:df8fcc028a95ac5ffab3b78c9163f5cfa672e41cd50128ca55d458b6cfbacf4b',
diff --git a/extern/snackbar b/extern/snackbar
deleted file mode 160000
-Subproject 12e1e8b7e88a09249aed68a48a6c4d06c401e00
diff --git a/settings.gradle b/settings.gradle
index 7256a20..1b90383 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,5 +8,4 @@ include ':extern:spongycastle:prov'
include ':extern:minidns'
include ':extern:KeybaseLib:Lib'
include ':extern:safeslinger-exchange'
-include ':extern:snackbar:lib'
include ':OpenKeychain-Test'