Skip to content
This repository was archived by the owner on Jun 9, 2025. It is now read-only.

Commit 615eda8

Browse files
authored
Update dependencies, clean up build config (#200)
1 parent d077602 commit 615eda8

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = "8.9.1"
2+
agp = "8.9.2"
33
android-desugar = "2.1.5"
44
androidx-core = "1.16.0"
55
androidx-test-rules = "1.6.1"
@@ -9,8 +9,8 @@ dokka = "1.9.20"
99
ical4j = "3.2.19" # final version; update to 4.x will require much work
1010
junit = "4.13.2"
1111
kotlin = "2.1.20"
12-
mockk = "1.14.0"
13-
slf4j = "2.0.16"
12+
mockk = "1.14.2"
13+
slf4j = "2.0.17"
1414

1515
[libraries]
1616
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" }
2121
junit = { module = "junit:junit", version.ref = "junit" }
2222
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
2323
mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }
24-
slf4j = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
24+
slf4j-jdk = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
2525

2626
[plugins]
2727
android-library = { id = "com.android.library", version.ref = "agp" }

lib/build.gradle.kts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,13 @@ publishing {
9090
}
9191
}
9292

93-
configurations.forEach {
94-
// exclude modules which are in conflict with system libraries
95-
it.exclude("commons-logging")
96-
it.exclude("org.json", "json")
97-
98-
// exclude groovy because we don"t need it, and it needs API 26+
99-
it.exclude("org.codehaus.groovy", "groovy")
100-
it.exclude("org.codehaus.groovy", "groovy-dateutil")
101-
}
102-
10393
dependencies {
10494
implementation(libs.kotlin.stdlib)
10595
coreLibraryDesugaring(libs.android.desugaring)
10696

10797
implementation(libs.androidx.core)
10898
api(libs.ical4j)
109-
implementation(libs.slf4j) // ical4j logging over java.util.Logger
99+
implementation(libs.slf4j.jdk) // ical4j uses slf4j, this module uses java.util.Logger
110100

111101
androidTestImplementation(libs.androidx.test.rules)
112102
androidTestImplementation(libs.androidx.test.runner)

lib/consumer-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

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

55
# don't warn when these are missing

0 commit comments

Comments
 (0)