mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-07-22 19:21:09 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Migrated to ical4android library (bitfireAT/davx5#302)

Browse source 
* Migrated to ical4android library

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

* Manually excluded Groovy

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

* Updated ical4android

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

* Update dependencies

* Added more exclusions

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

* Also update Room [skip CI]

---------

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-28 21:31:47 +02:00 committed by Ricki Hirner
parent 473dca62fa
commit 4ba50b969a
No known key found for this signature in database
GPG key ID: 79A019FCAAEDD3AA
5 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

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

13
app/build.gradle
View file

@ -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}"

7
build.gradle
View file

@ -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 {

1
ical4android

@ -1 +0,0 @@
Subproject commit 75e5be4f06cbf41a71f1e9d72113ff1ec5d51e4c

1
settings.gradle
View file

@ -1,3 +1,2 @@
include ':app'
include ':ical4android'