From 34801863c2f88bc61906f760c86620ffe070b3a3 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Wed, 7 May 2025 10:36:37 +0200
Subject: [PATCH] Update dependencies, clean up build config

---
 gradle/libs.versions.toml |  8 ++++----
 lib/build.gradle.kts      | 12 +-----------
 lib/consumer-rules.pro    |  2 +-
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 43dd314c..3be8ef8d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -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"
@@ -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" }
@@ -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" }
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 0bd1a32e..cb4cadfc 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -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)
diff --git a/lib/consumer-rules.pro b/lib/consumer-rules.pro
index 58cabf1a..18a085fe 100644
--- a/lib/consumer-rules.pro
+++ b/lib/consumer-rules.pro
@@ -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