Merge branch '43-update-conscrypt-+-other-dependencies' into upgrade-to-m3

# Conflicts:
#	gradle/libs.versions.toml
#	sample-app/build.gradle.kts

Author: ArnyminerZ

.github/workflows/build-kdoc.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: gradle
       - uses: gradle/actions/setup-gradle@v3
 

.github/workflows/codeql.yml

@@ -31,7 +31,7 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: temurin
-        java-version: 17
+        java-version: 21
         cache: gradle
     - uses: gradle/actions/setup-gradle@v3
 

.github/workflows/test-dev.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: gradle
       - uses: gradle/actions/setup-gradle@v3
 
@@ -23,15 +23,12 @@ jobs:
   test_on_emulator:
     name: Tests with emulator
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        api-level: [ 31 ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: gradle
       - uses: gradle/actions/setup-gradle@v3
 

gradle/libs.versions.toml

@@ -1,18 +1,18 @@
 [versions]
-agp = "8.6.0"
-androidx-activityCompose = "1.9.2"
+agp = "8.7.3"
+androidx-activityCompose = "1.9.3"
 androidx-appcompat = "1.7.0"
-androidx-core = "1.13.1"
-androidx-lifecycle = "2.8.5"
+androidx-core = "1.15.0"
+androidx-lifecycle = "2.8.7"
 androidx-test-core = "1.6.1"
 androidx-test-runner = "1.6.2"
 androidx-test-rules = "1.6.1"
-conscrypt = "2.5.2"
-compose-bom = "2024.09.01"
-dokka = "1.9.10"
+conscrypt = "2.5.3"
+compose-bom = "2024.11.00"
+dokka = "1.9.20"
 junit = "4.13.2"
-kotlin = "2.0.20"
-mockk = "1.13.12"
+kotlin = "2.1.0"
+mockk = "1.13.13"
 okhttp3 = "4.12.0"
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed May 17 11:37:23 CEST 2023
 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.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

lib/build.gradle.kts

@@ -9,11 +9,10 @@ plugins {
 android {
     namespace = "at.bitfire.cert4android"
 
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 21            // Android 5
-        targetSdk = 34
 
         aarMetadata {
             minCompileSdk = 29
@@ -23,11 +22,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
     kotlin {
-        jvmToolchain(17)
+        jvmToolchain(21)
     }
 
     buildFeatures {