aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-04-12 18:13:03 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-04-12 18:13:03 +0200
commit2512d3007e17e2709b6f3a1fcc49fe4ba8d2a5bf (patch)
treedf1f453eee09e9b85c7fde06ee40c25950949688
parentf44256589643df6c3dcad0f3c9ea263452b7e8eb (diff)
downloadopen-keychain-2512d3007e17e2709b6f3a1fcc49fe4ba8d2a5bf.zip
open-keychain-2512d3007e17e2709b6f3a1fcc49fe4ba8d2a5bf.tar.gz
open-keychain-2512d3007e17e2709b6f3a1fcc49fe4ba8d2a5bf.tar.bz2
Switch to html-textview from JCenter
-rw-r--r--.gitmodules4
-rw-r--r--OpenKeychain/build.gradle4
m---------extern/html-textview0
3 files changed, 2 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules
index 09cf5e7..db9342d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,6 @@
path = extern/spongycastle
url = https://github.com/open-keychain/spongycastle.git
ignore = dirty
-[submodule "extern/html-textview"]
- path = extern/html-textview
- url = https://github.com/open-keychain/html-textview.git
- ignore = dirty
[submodule "extern/openpgp-api-lib"]
path = extern/openpgp-api-lib
url = https://github.com/open-keychain/openpgp-api-lib.git
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index bfbc198..27b4725 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -22,11 +22,11 @@ dependencies {
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'
+ compile 'org.sufficientlysecure:html-textview:1.0'
// libs as submodules
compile project(':extern:openpgp-api-lib')
compile project(':extern:openkeychain-api-lib')
- compile project(':extern:html-textview')
compile project(':extern:spongycastle:core')
compile project(':extern:spongycastle:pg')
compile project(':extern:spongycastle:pkix')
@@ -55,9 +55,9 @@ dependencyVerification {
'org.commonjava.googlecode.markdown4j:markdown4j:e952e825d29e1317d96f79f346bfb6786c7c5eef50bd26e54a80823704b62e13',
'com.splitwise:tokenautocomplete:20bee71cc59b3828eb000b684d46ddf738efd56b8fee453a509cd16fda42c8cb',
'se.emilsjolander:stickylistheaders:bc158f51be842a5f92c6e2adc5782f6329b69796d76ebb8f39c77f611cdef573',
+ 'org.sufficientlysecure:html-textview:e0f0862f6080bffb2aaf2f5c0fecbf246dec850fd156d329406931093f598423',
// 'OpenKeychain.extern:openpgp-api-lib:f05a9215cdad3a6597e4c5ece6fcec92b178d218195a3e88d2c0937c48dd9580',
// 'OpenKeychain.extern:openkeychain-api-lib:50f6ebb5452d3fdc7be137ccf857a0ff44d55539fcb7b91baef495766ed7f429',
-// 'OpenKeychain.extern:html-textview:536822e8fdcd3e4628d0a1cd6c252285ba5f8e5bfb20d71ff80fdbdb6cc8be8c',
// 'com.madgag.spongycastle:core:df8fcc028a95ac5ffab3b78c9163f5cfa672e41cd50128ca55d458b6cfbacf4b',
// 'com.madgag.spongycastle:pg:160b345b10a2c92dc731453eec87037377f66a8e14a0648d404d7b193c4e380d',
// 'com.madgag.spongycastle:pkix:0b4f3301ea12dd9f25d71770e6ea9f75e0611bf53062543e47be5bc15340a7e4',
diff --git a/extern/html-textview b/extern/html-textview
deleted file mode 160000
-Subproject 9872a73156518fd8df79dd2cd4d24750574b9ac