Skip to content
Snippets Groups Projects
Verified Commit 7f71fedd authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

build: properly set jdk version

parent 7095f3e9
Branches
Tags
No related merge requests found
image: "k8r.eu/justjanne/android-sdk:dfb791e9" image: "k8r.eu/justjanne/android-sdk:be7526df"
cache: cache:
key: "$CI_PROJECT_NAME" key: "$CI_PROJECT_NAME"
......
import org.gradle.api.JavaVersion
import com.android.build.api.dsl.LibraryExtension import com.android.build.api.dsl.LibraryExtension
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
...@@ -24,6 +25,11 @@ class AndroidLibraryConvention : Plugin<Project> { ...@@ -24,6 +25,11 @@ class AndroidLibraryConvention : Plugin<Project> {
testInstrumentationRunnerArguments["disableAnalytics"] = "true" testInstrumentationRunnerArguments["disableAnalytics"] = "true"
} }
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
lint { lint {
warningsAsErrors = true warningsAsErrors = true
lintConfig = file("../lint.xml") lintConfig = file("../lint.xml")
......
...@@ -4,10 +4,13 @@ import org.gradle.api.Project ...@@ -4,10 +4,13 @@ import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.testing.Test import org.gradle.api.tasks.testing.Test
import org.gradle.jvm.toolchain.JavaLanguageVersion import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.jvm.toolchain.JavaToolchainService
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.provideDelegate import org.gradle.kotlin.dsl.provideDelegate
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain
class KotlinAndroidConvention : Plugin<Project> { class KotlinAndroidConvention : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
...@@ -18,6 +21,14 @@ class KotlinAndroidConvention : Plugin<Project> { ...@@ -18,6 +21,14 @@ class KotlinAndroidConvention : Plugin<Project> {
apply("com.google.devtools.ksp") apply("com.google.devtools.ksp")
} }
val service = project.extensions.getByType<JavaToolchainService>()
val customLauncher = service.launcherFor {
languageVersion.set(JavaLanguageVersion.of(17))
}
tasks.withType<UsesKotlinJavaToolchain>().configureEach {
kotlinJavaToolchain.toolchain.use(customLauncher)
}
// Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947 // Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
tasks.withType<KotlinCompile>().configureEach { tasks.withType<KotlinCompile>().configureEach {
kotlinOptions { kotlinOptions {
......
...@@ -4,13 +4,18 @@ import org.gradle.api.Project ...@@ -4,13 +4,18 @@ import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.testing.Test import org.gradle.api.tasks.testing.Test
import org.gradle.jvm.toolchain.JavaLanguageVersion import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.jvm.toolchain.JavaToolchainService
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.kotlin import org.gradle.kotlin.dsl.kotlin
import org.gradle.kotlin.dsl.provideDelegate import org.gradle.kotlin.dsl.provideDelegate
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask
import org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain
class KotlinConvention : Plugin<Project> { class KotlinConvention : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
...@@ -21,6 +26,14 @@ class KotlinConvention : Plugin<Project> { ...@@ -21,6 +26,14 @@ class KotlinConvention : Plugin<Project> {
apply("com.google.devtools.ksp") apply("com.google.devtools.ksp")
} }
val service = project.extensions.getByType<JavaToolchainService>()
val customLauncher = service.launcherFor {
languageVersion.set(JavaLanguageVersion.of(17))
}
tasks.withType<UsesKotlinJavaToolchain>().configureEach {
kotlinJavaToolchain.toolchain.use(customLauncher)
}
// Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947 // Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
tasks.withType<KotlinCompile>().configureEach { tasks.withType<KotlinCompile>().configureEach {
kotlinOptions { kotlinOptions {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment