Skip to content

Commit 65de909

Browse files
ArnyminerZrfc2822
andauthored
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]>
1 parent 69cc462 commit 65de909

File tree

10 files changed

+288
-218
lines changed

10 files changed

+288
-218
lines changed

.github/workflows/build-kdoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-java@v4
1919
with:
2020
distribution: temurin
21-
java-version: 17
21+
java-version: 21
2222
cache: gradle
2323
- uses: gradle/actions/setup-gradle@v3
2424

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/setup-java@v4
3232
with:
3333
distribution: temurin
34-
java-version: 17
34+
java-version: 21
3535
cache: gradle
3636
- uses: gradle/actions/setup-gradle@v3
3737

.github/workflows/test-dev.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/setup-java@v4
1414
with:
1515
distribution: temurin
16-
java-version: 17
16+
java-version: 21
1717
cache: gradle
1818
- uses: gradle/actions/setup-gradle@v3
1919

@@ -23,15 +23,12 @@ jobs:
2323
test_on_emulator:
2424
name: Tests with emulator
2525
runs-on: ubuntu-latest
26-
strategy:
27-
matrix:
28-
api-level: [ 31 ]
2926
steps:
3027
- uses: actions/checkout@v4
3128
- uses: actions/setup-java@v4
3229
with:
3330
distribution: temurin
34-
java-version: 17
31+
java-version: 21
3532
cache: gradle
3633
- uses: gradle/actions/setup-gradle@v3
3734

gradle/libs.versions.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
2-
agp = "8.7.1"
2+
agp = "8.7.3"
33
androidx-activityCompose = "1.9.3"
44
androidx-appcompat = "1.7.0"
5-
androidx-core = "1.13.1"
6-
androidx-lifecycle = "2.8.6"
5+
androidx-core = "1.15.0"
6+
androidx-lifecycle = "2.8.7"
77
androidx-test-core = "1.6.1"
88
androidx-test-runner = "1.6.2"
99
androidx-test-rules = "1.6.1"
10-
conscrypt = "2.5.2"
11-
compose-bom = "2024.10.00"
10+
conscrypt = "2.5.3"
11+
compose-bom = "2024.11.00"
1212
dokka = "1.9.20"
1313
junit = "4.13.2"
14-
kotlin = "2.0.21"
14+
kotlin = "2.1.0"
1515
mockk = "1.13.13"
1616
okhttp3 = "4.12.0"
1717

gradle/wrapper/gradle-wrapper.jar

-15.3 KB
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Wed May 17 11:37:23 CEST 2023
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)