M .gitmodules => .gitmodules +7 -7
@@ 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
M build.gradle => build.gradle +3 -3
@@ 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'
A libs/MemorizingTrustManager => libs/MemorizingTrustManager +1 -0
@@ 0,0 1,1 @@
+Subproject commit fad835037adc1bd313bb56b694426fca4eb67346
A libs/minidns => libs/minidns +1 -0
@@ 0,0 1,1 @@
+Subproject commit 9e42bff01440c1351946a432126d5a1b87fb7c78
A libs/openpgp-api-lib => libs/openpgp-api-lib +1 -0
@@ 0,0 1,1 @@
+Subproject commit 0be263d5d3effd2df5f976fa4a127017268749cc
D memorizingTrustManager => memorizingTrustManager +0 -1
@@ 1,1 0,0 @@
-Subproject commit fad835037adc1bd313bb56b694426fca4eb67346
D minidns => minidns +0 -1
@@ 1,1 0,0 @@
-Subproject commit 9e42bff01440c1351946a432126d5a1b87fb7c78
D openpgpapilib => openpgpapilib +0 -1
@@ 1,1 0,0 @@
-Subproject commit 0be263d5d3effd2df5f976fa4a127017268749cc
M settings.gradle => settings.gradle +3 -3
@@ 1,4 1,4 @@
-include ':memorizingTrustManager'
-include ':minidns'
-include ':openpgpapilib'
+include ':libs/MemorizingTrustManager'
+include ':libs/minidns'
+include ':libs/openpgp-api-lib'
include ':conversations'