Skip to content

Commit 71be68a

Browse files
authored
Update dependencies (#482)
1 parent 0ad5697 commit 71be68a

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

.github/workflows/codeql.yml

+1-1
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
- uses: gradle/actions/setup-gradle@v4
3636

3737
# Initializes the CodeQL tools for scanning.

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/setup-java@v4
1717
with:
1818
distribution: 'temurin'
19-
java-version: 17
19+
java-version: 21
2020
- uses: gradle/actions/setup-gradle@v4
2121

2222
- name: Prepare keystore

.github/workflows/test-dev.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/setup-java@v4
1212
with:
1313
distribution: 'temurin'
14-
java-version: 17
14+
java-version: 21
1515
- uses: gradle/actions/setup-gradle@v4
1616

1717
- name: Check
@@ -39,7 +39,7 @@ jobs:
3939
- uses: actions/setup-java@v4
4040
with:
4141
distribution: 'temurin'
42-
java-version: 17
42+
java-version: 21
4343
- uses: gradle/actions/setup-gradle@v4
4444

4545
- name: Enable KVM group perms

app/build.gradle.kts

+6-5
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@ android {
3434
compileOptions {
3535
isCoreLibraryDesugaringEnabled = true
3636

37-
sourceCompatibility = JavaVersion.VERSION_17
38-
targetCompatibility = JavaVersion.VERSION_17
37+
sourceCompatibility = JavaVersion.VERSION_21
38+
targetCompatibility = JavaVersion.VERSION_21
39+
}
40+
41+
kotlinOptions {
42+
jvmTarget = "21"
3943
}
4044

4145
buildFeatures {
@@ -83,9 +87,6 @@ android {
8387
disable.addAll(
8488
listOf("ExtraTranslation", "MissingTranslation", "InvalidPackage", "OnClick")
8589
)
86-
// TODO: Remove on the next Compose release, should be fixed
87-
// Maybe related to https://issuetracker.google.com/issues/298483892
88-
disable += "CoroutineCreationDuringComposition"
8990
}
9091

9192
packaging {

gradle/libs.versions.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ androidx-test-runner = "1.6.2"
1212
androidx-work = "2.10.0"
1313
bitfire-cert4android = "f0964cb"
1414
bitfire-ical4android = "505f74771e"
15-
# Keep in sync with Kotlin version: https://developer.android.com/jetpack/androidx/releases/compose-kotlin
16-
compose-compiler = "1.5.14"
1715
compose-dialogs = "1.3.0"
1816
compose-material = "1.7.6"
1917
compose-material3 = "1.3.1"
@@ -59,6 +57,7 @@ junit = { module = "junit:junit", version.ref = "junit" }
5957
kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
6058
okhttp-base = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
6159
okhttp-brotli = { module = "com.squareup.okhttp3:okhttp-brotli", version.ref = "okhttp" }
60+
# Use okhttp-coroutines and remove "Call.executeAsync" calls once OkHttp 5.0 stable is released
6261
okhttp-coroutines = { module = "com.squareup.okhttp3:okhttp-coroutines", version.ref = "okhttp" }
6362
okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
6463
room-base = { module = "androidx.room:room-ktx", version.ref = "room" }

0 commit comments

Comments
 (0)