diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1e94bd31c0f29f66f52c86c195ee6964751bcdc..eeebd2f62665787f3548bb50fbdfda111d4a7033 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "k8r.eu/justjanne/android-sdk:be7526df" +image: "k8r.eu/justjanne/android-sdk:dfb791e9" cache: key: "$CI_PROJECT_NAME" diff --git a/gradle/convention/build.gradle.kts b/gradle/convention/build.gradle.kts index 8b4b2698550aefabcc9aa7311a563121ac13aa29..f6940cf74d0b32d679a736741b04e9efcaba91fa 100644 --- a/gradle/convention/build.gradle.kts +++ b/gradle/convention/build.gradle.kts @@ -37,6 +37,6 @@ gradlePlugin { configure<JavaPluginExtension> { toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } diff --git a/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt b/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt index bb1e14e75a9cf2fab23ae9852de3a43efde5c7bb..97df14e91e8adbca5cc3fceddb439781648317db 100644 --- a/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt +++ b/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt @@ -44,7 +44,7 @@ class KotlinAndroidConvention : Plugin<Project> { targetCompatibility = JavaVersion.VERSION_11 toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } } diff --git a/gradle/convention/src/main/kotlin/KotlinConvention.kt b/gradle/convention/src/main/kotlin/KotlinConvention.kt index 291284f46cf2744b7e2de69eb2fe4653f8997e31..45cd6a0cd92e43a7b089a7cffc681bd441abd478 100644 --- a/gradle/convention/src/main/kotlin/KotlinConvention.kt +++ b/gradle/convention/src/main/kotlin/KotlinConvention.kt @@ -47,7 +47,7 @@ class KotlinConvention : Plugin<Project> { targetCompatibility = JavaVersion.VERSION_11 toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) + languageVersion.set(JavaLanguageVersion.of(17)) } } }