Integrate vcard4android as an android library (bitfireAT/davx5#300)

* Migrated to external dependency for vcard4android

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

* Removed vcard4android submodule

* Update vcard4android version, remove from settings.gradle

---------

Signed-off-by: Arnau Mora <arnyminerz@proton.me>
Co-authored-by: Ricki Hirner <hirner@bitfire.at>
This commit is contained in:
Arnau Mora 2023-06-14 14:10:45 +02:00 committed by Ricki Hirner
parent 1b521e3c17
commit f820e92d15
5 changed files with 2 additions and 6 deletions

3
.gitmodules vendored
View file

@ -1,6 +1,3 @@
[submodule "ical4android"]
path = ical4android
url = https://github.com/bitfireAT/ical4android.git
[submodule "vcard4android"]
path = vcard4android
url = https://github.com/bitfireAT/vcard4android.git

View file

@ -112,7 +112,7 @@ android {
dependencies {
implementation "com.github.bitfireAT:cert4android:${versions.cert4android}"
implementation project(':ical4android')
implementation project(':vcard4android')
implementation "com.github.bitfireAT:vcard4android:${versions.vcard4android}"
implementation "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"

View file

@ -17,6 +17,7 @@ buildscript {
commonsText: '1.3',
// own libraries
cert4android: 'c87a7e9',
vcard4android: 'c2f201ae62e01f59b8d7b08ffc8fc47ab83c041a',
dav4jvm: '47dd6a9'
]

View file

@ -1,4 +1,3 @@
include ':app'
include ':ical4android'
include ':vcard4android'

@ -1 +0,0 @@
Subproject commit 3851e70f43cd17b934f8f75de9e6f0013dcc131c