From a6d0042e5c595cf7d6d19a2c3afd3c9309727212 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sun, 26 Oct 2014 09:35:11 -0400 Subject: Move submodules back to libs/ --- .gitmodules | 14 +++++++------- build.gradle | 6 +++--- libs/MemorizingTrustManager | 1 + libs/minidns | 1 + libs/openpgp-api-lib | 1 + memorizingTrustManager | 1 - minidns | 1 - openpgpapilib | 1 - settings.gradle | 6 +++--- 9 files changed, 16 insertions(+), 16 deletions(-) create mode 160000 libs/MemorizingTrustManager create mode 160000 libs/minidns create mode 160000 libs/openpgp-api-lib delete mode 160000 memorizingTrustManager delete mode 160000 minidns delete mode 160000 openpgpapilib 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/libs/MemorizingTrustManager b/libs/MemorizingTrustManager new file mode 160000 index 00000000..fad83503 --- /dev/null +++ b/libs/MemorizingTrustManager @@ -0,0 +1 @@ +Subproject commit fad835037adc1bd313bb56b694426fca4eb67346 diff --git a/libs/minidns b/libs/minidns new file mode 160000 index 00000000..9e42bff0 --- /dev/null +++ b/libs/minidns @@ -0,0 +1 @@ +Subproject commit 9e42bff01440c1351946a432126d5a1b87fb7c78 diff --git a/libs/openpgp-api-lib b/libs/openpgp-api-lib new file mode 160000 index 00000000..0be263d5 --- /dev/null +++ b/libs/openpgp-api-lib @@ -0,0 +1 @@ +Subproject commit 0be263d5d3effd2df5f976fa4a127017268749cc diff --git a/memorizingTrustManager b/memorizingTrustManager deleted file mode 160000 index fad83503..00000000 --- a/memorizingTrustManager +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fad835037adc1bd313bb56b694426fca4eb67346 diff --git a/minidns b/minidns deleted file mode 160000 index 9e42bff0..00000000 --- a/minidns +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9e42bff01440c1351946a432126d5a1b87fb7c78 diff --git a/openpgpapilib b/openpgpapilib deleted file mode 160000 index 0be263d5..00000000 --- a/openpgpapilib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0be263d5d3effd2df5f976fa4a127017268749cc 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' -- cgit v1.2.3