aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-10-26 09:35:11 -0400
committerSam Whited <sam@samwhited.com>2014-10-26 09:54:41 -0400
commita6d0042e5c595cf7d6d19a2c3afd3c9309727212 (patch)
tree5d9ef73bac4b0f6ff05e504c3d381491db917043
parent90898ec3d440a5ebce99724d31954e583ea9f227 (diff)
Move submodules back to libs/
-rw-r--r--.gitmodules14
-rw-r--r--build.gradle6
m---------libs/MemorizingTrustManager (renamed from memorizingTrustManager)0
m---------libs/minidns (renamed from minidns)0
m---------libs/openpgp-api-lib (renamed from openpgpapilib)0
-rw-r--r--settings.gradle6
6 files changed, 13 insertions, 13 deletions
diff --git a/.gitmodules b/.gitmodules
index e9290245..e4098287 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "minidns"]
- path = minidns
+[submodule "libs/MemorizingTrustManager"]
+ path = libs/MemorizingTrustManager
+ url = https://github.com/iNPUTmice/MemorizingTrustManager.git
+[submodule "libs/minidns"]
+ path = libs/minidns
url = https://github.com/rtreffer/minidns.git
-[submodule "openpgpapilib"]
- path = openpgpapilib
+[submodule "libs/openpgp-api-lib"]
+ path = libs/openpgp-api-lib
url = https://github.com/open-keychain/openpgp-api-lib.git
-[submodule "memorizingTrustManager"]
- path = memorizingTrustManager
- url = https://github.com/iNPUTmice/MemorizingTrustManager.git
diff --git a/build.gradle b/build.gradle
index c46df4c7..37d59089 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,9 +28,9 @@ repositories {
}
dependencies {
- compile project(':minidns')
- compile project(':openpgpapilib')
- compile project(':memorizingTrustManager')
+ compile project(':libs/minidns')
+ compile project(':libs/openpgp-api-lib')
+ compile project(':libs/MemorizingTrustManager')
compile 'com.android.support:support-v13:19.1.0'
compile 'org.bouncycastle:bcprov-jdk15on:1.50'
compile 'net.java:otr4j:0.21'
diff --git a/memorizingTrustManager b/libs/MemorizingTrustManager
-Subproject fad835037adc1bd313bb56b694426fca4eb6734
+Subproject fad835037adc1bd313bb56b694426fca4eb6734
diff --git a/minidns b/libs/minidns
-Subproject 9e42bff01440c1351946a432126d5a1b87fb7c7
+Subproject 9e42bff01440c1351946a432126d5a1b87fb7c7
diff --git a/openpgpapilib b/libs/openpgp-api-lib
-Subproject 0be263d5d3effd2df5f976fa4a127017268749c
+Subproject 0be263d5d3effd2df5f976fa4a127017268749c
diff --git a/settings.gradle b/settings.gradle
index 890f1242..52bfd2b4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':memorizingTrustManager'
-include ':minidns'
-include ':openpgpapilib'
+include ':libs/MemorizingTrustManager'
+include ':libs/minidns'
+include ':libs/openpgp-api-lib'
include ':conversations'