Skip to content
This repository was archived by the owner on Jun 9, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
agp = "8.9.1"
agp = "8.9.2"
android-desugar = "2.1.5"
androidx-core = "1.16.0"
androidx-test-rules = "1.6.1"
Expand All @@ -9,8 +9,8 @@ dokka = "1.9.20"
ical4j = "3.2.19" # final version; update to 4.x will require much work
junit = "4.13.2"
kotlin = "2.1.20"
mockk = "1.14.0"
slf4j = "2.0.16"
mockk = "1.14.2"
slf4j = "2.0.17"

[libraries]
android-desugaring = { module = "com.android.tools:desugar_jdk_libs", version.ref = "android-desugar" }
Expand All @@ -21,7 +21,7 @@ ical4j = { module = "org.mnode.ical4j:ical4j", version.ref = "ical4j" }
junit = { module = "junit:junit", version.ref = "junit" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }
slf4j = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
slf4j-jdk = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }

[plugins]
android-library = { id = "com.android.library", version.ref = "agp" }
Expand Down
12 changes: 1 addition & 11 deletions lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,13 @@ publishing {
}
}

configurations.forEach {
// exclude modules which are in conflict with system libraries
it.exclude("commons-logging")
it.exclude("org.json", "json")

// exclude groovy because we don"t need it, and it needs API 26+
it.exclude("org.codehaus.groovy", "groovy")
it.exclude("org.codehaus.groovy", "groovy-dateutil")
}

dependencies {
implementation(libs.kotlin.stdlib)
coreLibraryDesugaring(libs.android.desugaring)

implementation(libs.androidx.core)
api(libs.ical4j)
implementation(libs.slf4j) // ical4j logging over java.util.Logger
implementation(libs.slf4j.jdk) // ical4j uses slf4j, this module uses java.util.Logger

androidTestImplementation(libs.androidx.test.rules)
androidTestImplementation(libs.androidx.test.runner)
Expand Down
2 changes: 1 addition & 1 deletion lib/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# keep all iCalendar properties/parameters (used via reflection)
# keep all iCalendar properties/parameters (referenced over ServiceLoader)
-keep class net.fortuna.ical4j.** { *; }

# don't warn when these are missing
Expand Down
Loading