Merge branch 'dev' into upgrade_livedata_runtime

# Conflicts:
#	build.gradle

app/build.gradle

@@ -1,12 +1,13 @@
+import com.mikepenz.aboutlibraries.plugin.DuplicateMode
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply plugin: 'com.google.devtools.ksp'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion '33.0.2'
+    compileSdk 34
 
     namespace 'at.bitfire.icsdroid'
 
@@ -43,10 +44,10 @@ android {
 
     composeOptions {
         // Keep in sync with Kotlin version: https://developer.android.com/jetpack/androidx/releases/compose-kotlin
-        kotlinCompilerExtensionVersion = '1.4.7'
+        kotlinCompilerExtensionVersion = '1.5.1'
     }
 
-    flavorDimensions "distribution"
+    flavorDimensions = ["distribution"]
     productFlavors {
         standard
         gplay
@@ -88,7 +89,7 @@ android {
 }
 
 configurations {
-    all {
+    configureEach {
         // exclude modules which are in conflict with system libraries
         exclude module: "commons-logging"
         exclude group: "org.json", module: "json"
@@ -99,7 +100,7 @@ configurations {
 }
 
 dependencies {
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
     implementation 'com.github.bitfireAT:cert4android:3817e62d9f173d8f8b800d24769f42cb205f560e'
@@ -109,7 +110,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.core:core-ktx:1.10.1'
-    implementation 'androidx.fragment:fragment-ktx:1.5.7'
+    implementation 'androidx.fragment:fragment-ktx:1.6.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
@@ -156,6 +157,6 @@ dependencies {
 }
 
 aboutLibraries {
-    duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
+    duplicationMode = DuplicateMode.MERGE
     includePlatform = false
 }

build.gradle

@@ -2,10 +2,10 @@ buildscript {
     ext.versions = [
         aboutLibs: '10.7.0',
         composeBom: '2023.08.00',   // https://developer.android.com/jetpack/compose/bom
-        kotlin: '1.8.21',           // keep in sync with app/build.gradle composeOptions.kotlinCompilerExtensionVersion
+        kotlin: '1.9.0',            // keep in sync with app/build.gradle composeOptions.kotlinCompilerExtensionVersion
         ksp: '1.0.11',
         okhttp: '5.0.0-alpha.11',
-        room: '2.5.1'
+        room: '2.5.2'
     ]
 
     repositories {
@@ -14,7 +14,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibs}"
         classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${versions.kotlin}-${versions.ksp}"

gradle.properties

@@ -4,7 +4,6 @@ org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # use AndroidX
 android.useAndroidX=true
-android.databinding.incremental=true
 
 # configuration cache [https://developer.android.com/build/optimize-your-build#use-the-configuration-cache-experimental]
 org.gradle.unsafe.configuration-cache=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -4,4 +4,4 @@ pluginManagement {
     }
 }
 
-include ':app', ':ical4android'
+include ':app'