From b8043a563a82dd423966a5611a9d77217d8eb762 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Fri, 19 Jan 2018 15:37:58 +0000 Subject: [PATCH] Switch ical/vcard/cert4android to our own repos. DAVdroid have updated to kotlin, and kotlin is problematic with annotation processors which was breaking the whole build. This also meant we were not able to update to a new gradle version or import just partial, smaller fixes. Now we have control over the submodules as well, which fixes the above issues. At least for now. --- .gitmodules | 6 +++--- cert4android | 2 +- ical4android | 2 +- vcard4android | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8e635782..6e3c53d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "ical4android"] path = ical4android - url = https://gitlab.com/bitfireAT/ical4android.git + url = https://gitlab.com/tasn/ical4android.git [submodule "vcard4android"] path = vcard4android - url = https://gitlab.com/bitfireAT/vcard4android.git + url = https://gitlab.com/tasn/vcard4android.git [submodule "cert4android"] path = cert4android - url = https://gitlab.com/bitfireAT/cert4android.git + url = https://gitlab.com/tasn/cert4android.git diff --git a/cert4android b/cert4android index 9033f39d..e8a95719 160000 --- a/cert4android +++ b/cert4android @@ -1 +1 @@ -Subproject commit 9033f39d1f541b62750c2bfa9c93a893d6af2f63 +Subproject commit e8a95719e581749997614d614cb6bf36d43fd7b7 diff --git a/ical4android b/ical4android index 49fbb684..92ff8d06 160000 --- a/ical4android +++ b/ical4android @@ -1 +1 @@ -Subproject commit 49fbb6846153fee5e5cbc71b77e94bef7629936d +Subproject commit 92ff8d06148737bb35e5ace9a9538943f9bdc81f diff --git a/vcard4android b/vcard4android index d6ad012f..42825421 160000 --- a/vcard4android +++ b/vcard4android @@ -1 +1 @@ -Subproject commit d6ad012f11f3cd34fe6cfff3115d9524ba31a0ab +Subproject commit 42825421c620ec01256f4d3a00030aabe64efca8