Update Conscrypt (+ other dependencies) (#44)

* Upgrade dependency versions * Got rid of Matrix * Upgrade JDK to 21 * Upgrade Conscrypt * Missing JDK upgrade * Upgrade Gradle Wrapper * Upgrade SDK level * Update gradle+wrapper to 8.11.1 --------- Co-authored-by: Ricki Hirner <[email protected]>
bitfireAT · Dec 12, 2024 · 65de909 · 65de909
1 parent 69cc462
commit 65de909
Show file tree

Hide file tree

Showing 10 changed files with 288 additions and 218 deletions.
diff --git a/.github/workflows/build-kdoc.yml b/.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
 

diff --git a/.github/workflows/codeql.yml b/.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
 

diff --git a/.github/workflows/test-dev.yml b/.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
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-agp = "8.7.1"
+agp = "8.7.3"
 androidx-activityCompose = "1.9.3"
 androidx-appcompat = "1.7.0"
-androidx-core = "1.13.1"
-androidx-lifecycle = "2.8.6"
+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.10.00"
+conscrypt = "2.5.3"
+compose-bom = "2024.11.00"
 dokka = "1.9.20"
 junit = "4.13.2"
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 mockk = "1.13.13"
 okhttp3 = "4.12.0"
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed May 17 11:37:23 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists