From 7095f3e9dd82c697d557654458055331786a2989 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Wed, 30 Aug 2023 03:10:17 +0200
Subject: [PATCH] ci: use correct jdk version
---
.gitlab-ci.yml | 2 +-
gradle/convention/build.gradle.kts | 2 +-
gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt | 2 +-
gradle/convention/src/main/kotlin/KotlinConvention.kt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1e94bd31..eeebd2f62 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 8b4b26985..f6940cf74 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 bb1e14e75..97df14e91 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 291284f46..45cd6a0cd 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))
}
}
}
--
GitLab