Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f820e92d authored by Arnau Mora's avatar Arnau Mora Committed by Ricki Hirner
Browse files

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



* Migrated to external dependency for vcard4android

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

* Removed vcard4android submodule

* Update vcard4android version, remove from settings.gradle

---------

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>
Co-authored-by: default avatarRicki Hirner <hirner@bitfire.at>
parent 1b521e3c

.gitmodules

+0 −3
Original line number Diff line number Diff line 
[submodule "ical4android"]

	path = ical4android

	url = https://github.com/bitfireAT/ical4android.git
 
[submodule "vcard4android"]

	path = vcard4android

	url = https://github.com/bitfireAT/vcard4android.git

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -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"

build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ buildscript { 
        commonsText: '1.3',

        // own libraries

        cert4android: 'c87a7e9',

        vcard4android: 'c2f201ae62e01f59b8d7b08ffc8fc47ab83c041a',

        dav4jvm: '47dd6a9'

    ]

settings.gradle

+0 −1
Original line number Diff line number Diff line 


include ':app'

include ':ical4android'
 
include ':vcard4android'

vcard4android @ 3851e70f

Compare 3851e70f to 3851e70f
Original line number Diff line number Diff line 
Subproject commit 3851e70f43cd17b934f8f75de9e6f0013dcc131c