Merge branch 'main-ose' into 896-generalize-syncer

bitfireAT · Jul 22, 2024 · 0d199a3 · 0d199a3
2 parents d407e70 + 907b38f
commit 0d199a3
Show file tree

Hide file tree

Showing 138 changed files with 3,995 additions and 2,683 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,8 +18,8 @@ android {
     defaultConfig {
         applicationId = "at.bitfire.davdroid"
 
-        versionCode = 404010101
-        versionName = "4.4.1.1"
+        versionCode = 404020000
+        versionName = "4.4.2-alpha.1"
 
         buildConfigField("long", "buildTime", "${System.currentTimeMillis()}L")
 
@@ -30,7 +30,7 @@ android {
 
         buildConfigField("String", "userAgent", "\"DAVx5\"")
 
-        testInstrumentationRunner = "at.bitfire.davdroid.CustomTestRunner"
+        testInstrumentationRunner = "at.bitfire.davdroid.HiltTestRunner"
     }
 
     java {
@@ -40,7 +40,9 @@ android {
     }
 
     compileOptions {
-        // enable because ical4android requires desugaring
+        // required for
+        // - dnsjava 3.x: java.nio.file.Path
+        // - ical4android: time API
         isCoreLibraryDesugaringEnabled = true
     }
 
@@ -211,4 +213,4 @@ dependencies {
     testImplementation(libs.junit)
     testImplementation(libs.mockk)
     testImplementation(libs.okhttp.mockwebserver)
-}
+}