From 2050be3995bde67541ceb78050b3c9143907444f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 30 Mar 2015 16:08:25 +0200
Subject: [PATCH] Add TokenAutoComplete and StickyListHeaders as maven
 dependencies instead of git submodules

---
 .gitmodules               | 8 --------
 OpenKeychain/build.gradle | 8 ++++----
 extern/StickyListHeaders  | 1 -
 extern/TokenAutoComplete  | 1 -
 4 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 160000 extern/StickyListHeaders
 delete mode 160000 extern/TokenAutoComplete

diff --git a/.gitmodules b/.gitmodules
index e946dca3c..09cf5e785 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "extern/StickyListHeaders"]
-	path = extern/StickyListHeaders
-	url = https://github.com/open-keychain/StickyListHeaders.git
-	ignore = dirty
 [submodule "extern/spongycastle"]
 	path = extern/spongycastle
 	url = https://github.com/open-keychain/spongycastle.git
@@ -26,10 +22,6 @@
 	path = extern/minidns
 	url = https://github.com/open-keychain/minidns.git
 	ignore = dirty
-[submodule "extern/TokenAutoComplete"]
-	path = extern/TokenAutoComplete
-	url = https://github.com/open-keychain/TokenAutoComplete
-        ignore = dirty
 [submodule "extern/safeslinger-exchange"]
 	path = extern/safeslinger-exchange
 	url = https://github.com/open-keychain/exchange-android
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 7f92d3811..bfbc19893 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -20,19 +20,19 @@ dependencies {
     compile 'it.neokree:MaterialNavigationDrawer:1.3.2'
     compile 'com.getbase:floatingactionbutton:1.9.0'
     compile 'org.commonjava.googlecode.markdown4j:markdown4j:2.2-cj-1.0'
+    compile "com.splitwise:tokenautocomplete:1.3.3@aar"
+    compile 'se.emilsjolander:stickylistheaders:2.5.2'
 
     // libs as submodules
     compile project(':extern:openpgp-api-lib')
     compile project(':extern:openkeychain-api-lib')
     compile project(':extern:html-textview')
-    compile project(':extern:StickyListHeaders:library')
     compile project(':extern:spongycastle:core')
     compile project(':extern:spongycastle:pg')
     compile project(':extern:spongycastle:pkix')
     compile project(':extern:spongycastle:prov')
     compile project(':extern:minidns')
     compile project(':extern:KeybaseLib:Lib')
-    compile project(':extern:TokenAutoComplete:library')
     compile project(':extern:safeslinger-exchange')
     compile project(':extern:snackbar:lib')
 }
@@ -53,17 +53,17 @@ dependencyVerification {
             'it.neokree:MaterialNavigationDrawer:a1221a410c5f71bf078c5c4768fdf06b402d6006c74f8e7b61199e4edc2aea57',
             'com.getbase:floatingactionbutton:052aa2a94e49e5dccc97cb99f2add87e8698b84859f0e3ac181100c0bc7640ca',
             'org.commonjava.googlecode.markdown4j:markdown4j:e952e825d29e1317d96f79f346bfb6786c7c5eef50bd26e54a80823704b62e13',
+            'com.splitwise:tokenautocomplete:20bee71cc59b3828eb000b684d46ddf738efd56b8fee453a509cd16fda42c8cb',
+            'se.emilsjolander:stickylistheaders:bc158f51be842a5f92c6e2adc5782f6329b69796d76ebb8f39c77f611cdef573',
 //            'OpenKeychain.extern:openpgp-api-lib:f05a9215cdad3a6597e4c5ece6fcec92b178d218195a3e88d2c0937c48dd9580',
 //            'OpenKeychain.extern:openkeychain-api-lib:50f6ebb5452d3fdc7be137ccf857a0ff44d55539fcb7b91baef495766ed7f429',
 //            'OpenKeychain.extern:html-textview:536822e8fdcd3e4628d0a1cd6c252285ba5f8e5bfb20d71ff80fdbdb6cc8be8c',
-//            'OpenKeychain.extern.StickyListHeaders:library:d9937cf9d9992863e32cee1f18ffec12df7b97dd83939bb75ee6cf747c54bed1',
 //            'com.madgag.spongycastle:core:df8fcc028a95ac5ffab3b78c9163f5cfa672e41cd50128ca55d458b6cfbacf4b',
 //            'com.madgag.spongycastle:pg:160b345b10a2c92dc731453eec87037377f66a8e14a0648d404d7b193c4e380d',
 //            'com.madgag.spongycastle:pkix:0b4f3301ea12dd9f25d71770e6ea9f75e0611bf53062543e47be5bc15340a7e4',
 //            'com.madgag.spongycastle:prov:7325942e0b39f5fb35d6380818eed4b826e7dfc7570ad35b696d778049d8c36a',
 //            'OpenKeychain.extern:minidns:77b1786d29469e3b21f9404827cab811edc857cd68bc732cd57f11307c332eae',
 //            'OpenKeychain.extern.KeybaseLib:Lib:c91cda4a75692d8664644cd17d8ac962ce5bc0e266ea26673a639805f1eccbdf',
-//            'OpenKeychain.extern.TokenAutoComplete:library:9333f1c269996812baa18c0494e42f931309ab00a3cdb65a6e4d70f82d4c7107',
 //            'OpenKeychain.extern:safeslinger-exchange:d222721bb35408daaab9f46449364b2657112705ee571d7532f81cbeb9c4a73f',
 //            'OpenKeychain.extern.snackbar:lib:52357426e5275412e2063bdf6f0e6b957a3ea74da45e0aef35d22d9afc542e23',
             'com.android.support:support-annotations:ab6b131ab0e1edd165d21fb4c3edadeacbee9539aa166f7f7cbae05b60dc207a',
diff --git a/extern/StickyListHeaders b/extern/StickyListHeaders
deleted file mode 160000
index 70a2ed806..000000000
--- a/extern/StickyListHeaders
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 70a2ed80632938540bf07b81270384f4e5a96f9e
diff --git a/extern/TokenAutoComplete b/extern/TokenAutoComplete
deleted file mode 160000
index 1d6d3882e..000000000
--- a/extern/TokenAutoComplete
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1d6d3882e711c14c93abf73cbcbd28b9e0e2b498