From 33e4913761d9feb720d05693b9a4ce86d2ebe9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Garc=C3=ADa=20Amor?= Date: Tue, 18 Apr 2023 14:34:05 +0200 Subject: [PATCH] Sets compileJava target to 17 to work with Flamingo --- .idea/compiler.xml | 2 +- build.gradle | 4 ++-- gradle_scripts/android-module-bootstrap.gradle | 4 ++-- gradle_scripts/code_quality.gradle | 2 +- ultrasonic/build.gradle | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8a..b589d56e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 645a8825..a4f4bb4b 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ allprojects { // Set Kotlin JVM target to the same for all subprojects tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } } } @@ -48,4 +48,4 @@ allprojects { wrapper { gradleVersion(libs.versions.gradle.get()) distributionType("all") -} +} \ No newline at end of file diff --git a/gradle_scripts/android-module-bootstrap.gradle b/gradle_scripts/android-module-bootstrap.gradle index c771441c..eeb4fe6d 100644 --- a/gradle_scripts/android-module-bootstrap.gradle +++ b/gradle_scripts/android-module-bootstrap.gradle @@ -16,8 +16,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } sourceSets { diff --git a/gradle_scripts/code_quality.gradle b/gradle_scripts/code_quality.gradle index 2d4226eb..8738567e 100644 --- a/gradle_scripts/code_quality.gradle +++ b/gradle_scripts/code_quality.gradle @@ -29,6 +29,6 @@ if (isCodeQualityEnabled) { config = files("${rootProject.projectDir}/detekt-config.yml") } } - tasks.detekt.jvmTarget = "11" + tasks.detekt.jvmTarget = "17" } } diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index 74e782ff..d3d23252 100644 --- a/ultrasonic/build.gradle +++ b/ultrasonic/build.gradle @@ -50,7 +50,7 @@ android { } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } buildFeatures { @@ -59,8 +59,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kapt {