Merge branch 'main' into 40-get-rid-of-apache-commons-if-possible

bitfireAT · Jul 15, 2024 · ffa593f · ffa593f
2 parents e58914a + 29300bc
commit ffa593f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
-agp = "8.4.0"
-androidx-annotation = "1.7.1"
-androidx-test-runner = "1.5.2"
-androidx-rest-rules = "1.5.0"
+agp = "8.5.1"
+androidx-annotation = "1.8.0"
+androidx-test-runner = "1.6.1"
+androidx-rest-rules = "1.6.1"
 desugar = "2.0.4"
 dokka = "1.9.20"
 ezvcard = "0.12.1"
-kotlin = "1.9.24"
+kotlin = "2.0.0"
 junit = "4.13.2"
 
 [libraries]

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lib/src/main/java/at/bitfire/vcard4android/Constants.kt b/lib/src/main/java/at/bitfire/vcard4android/Constants.kt
@@ -4,16 +4,11 @@
 
 package at.bitfire.vcard4android
 
-import java.util.logging.Level
 import java.util.logging.Logger
 
 object Constants {
 
-    val log: Logger = Logger.getLogger("vcard4android")
-
-    init {
-        if (BuildConfig.DEBUG)
-            log.level = Level.ALL
-    }
+    @Deprecated("Use java.util.Logger.getLogger(javaClass.name) instead", ReplaceWith("Logger.getLogger(javaClass.name)", "java.util.logging.Logger"))
+    val log: Logger = Logger.getLogger("at.bitfire.vcard4android")
 
 }