From a6d0042e5c595cf7d6d19a2c3afd3c9309727212 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sun, 26 Oct 2014 09:35:11 -0400 Subject: [PATCH] Move submodules back to libs/ --- .gitmodules | 14 +++++++------- build.gradle | 6 +++--- .../MemorizingTrustManager | 0 minidns => libs/minidns | 0 openpgpapilib => libs/openpgp-api-lib | 0 settings.gradle | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) rename memorizingTrustManager => libs/MemorizingTrustManager (100%) rename minidns => libs/minidns (100%) rename openpgpapilib => libs/openpgp-api-lib (100%) diff --git a/.gitmodules b/.gitmodules index e92902458..e4098287a 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 c46df4c79..37d59089a 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 similarity index 100% rename from memorizingTrustManager rename to libs/MemorizingTrustManager diff --git a/minidns b/libs/minidns similarity index 100% rename from minidns rename to libs/minidns diff --git a/openpgpapilib b/libs/openpgp-api-lib similarity index 100% rename from openpgpapilib rename to libs/openpgp-api-lib diff --git a/settings.gradle b/settings.gradle index 890f1242c..52bfd2b46 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' -- 2.45.2