aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormar-v-in <github@rvin.mooo.com>2014-06-05 23:46:14 +0200
committermar-v-in <github@rvin.mooo.com>2014-06-05 23:46:14 +0200
commit36312b950aa2e3150ec9381c91850c63ed1c604b (patch)
tree8bef247abda9b2e1ad68898d2d7c7a72b3efad73
parent80e99986401b635f4eeef5d13740911d10740aef (diff)
downloadopen-keychain-36312b950aa2e3150ec9381c91850c63ed1c604b.tar.gz
open-keychain-36312b950aa2e3150ec9381c91850c63ed1c604b.tar.bz2
open-keychain-36312b950aa2e3150ec9381c91850c63ed1c604b.zip
Add dnsjava as submodule
-rw-r--r--.gitmodules3
-rw-r--r--OpenKeychain/build.gradle2
m---------extern/dnsjava0
-rw-r--r--settings.gradle1
4 files changed, 5 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 572293f94..20a0f60e0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
[submodule "extern/openkeychain-api-lib"]
path = extern/openkeychain-api-lib
url = https://github.com/open-keychain/openkeychain-api-lib.git
+[submodule "extern/dnsjava"]
+ path = extern/dnsjava
+ url = https://github.com/open-keychain/dnsjava.git
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 374a63b28..20e5ca594 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -14,7 +14,6 @@ dependencies {
compile 'com.android.support:support-v4:19.1.0'
compile 'com.android.support:appcompat-v7:19.1.0'
- compile 'dnsjava:dnsjava:2.1.1'
compile project(':extern:openpgp-api-lib')
compile project(':extern:openkeychain-api-lib')
compile project(':extern:html-textview')
@@ -27,6 +26,7 @@ dependencies {
compile project(':extern:spongycastle:pkix')
compile project(':extern:spongycastle:prov')
compile project(':extern:AppMsg:library')
+ compile project(':extern:dnsjava')
// Dependencies for the `instrumentTest` task, make sure to list all your global dependencies here as well
androidTestCompile 'junit:junit:4.10'
diff --git a/extern/dnsjava b/extern/dnsjava
new file mode 160000
+Subproject 71c8a9e56b19b34907e7e2e810ca15b57e3edc2
diff --git a/settings.gradle b/settings.gradle
index b0162875a..d7ca15f82 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,3 +11,4 @@ include ':extern:spongycastle:pg'
include ':extern:spongycastle:pkix'
include ':extern:spongycastle:prov'
include ':extern:AppMsg:library'
+include ':extern:dnsjava'