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

Unverified Commit 4ba50b96 authored by Arnau Mora's avatar Arnau Mora Committed by Ricki Hirner
Browse files

Migrated to ical4android library (bitfireAT/davx5#302)



* Migrated to ical4android library

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

* Manually excluded Groovy

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

* Updated ical4android

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

* Update dependencies

* Added more exclusions

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

* Also update Room [skip CI]

---------

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

.gitmodules

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line
[submodule "ical4android"]
	path = ical4android
	url = https://github.com/bitfireAT/ical4android.git
+12 −1
Original line number Diff line number Diff line
@@ -109,9 +109,20 @@ android {
    }
}

configurations {
    all {
        // exclude modules which are in conflict with system libraries
        exclude module: "commons-logging"
        exclude group: "org.json", module: "json"

        // Groovy requires SDK 26+, and it's not required, so exclude it
        exclude group: 'org.codehaus.groovy'
    }
}

dependencies {
    implementation "com.github.bitfireAT:cert4android:${versions.cert4android}"
    implementation project(':ical4android')
    implementation "com.github.bitfireAT:ical4android:${versions.ical4android}"
    implementation "com.github.bitfireAT:vcard4android:${versions.vcard4android}"

    implementation "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
+4 −3
Original line number Diff line number Diff line
@@ -10,15 +10,16 @@ buildscript {
        hilt: '2.46.1',
        kotlin: '1.8.21',       // keep in sync with app/build.gradle composeOptions.kotlinCompilerExtensionVersion
        okhttp: '4.10.0',
        room: '2.5.1',
        room: '2.5.2',
        // latest Apache Commons versions that don't require Java 8 (Android 7)
        commonsCollections: '4.2',
        commonsLang: '3.8.1',
        commonsText: '1.3',
        // own libraries
        cert4android: 'c87a7e9',
        vcard4android: 'c2f201a',
        dav4jvm: '47dd6a9'
        dav4jvm: '47dd6a9',
        ical4android: '0b1a068',
        vcard4android: 'c2f201a'
    ]

    repositories {
Compare 75e5be4f to 75e5be4f
Original line number Diff line number Diff line
Subproject commit 75e5be4f06cbf41a71f1e9d72113ff1ec5d51e4c
+0 −1
Original line number Diff line number Diff line

include ':app'
include ':ical4android'