From 72696ae557f6f156fb13f68e1cdb33cbea6d4b44 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 16 May 2023 15:54:35 +0530 Subject: feat(build): raise target bytecode to Java 17 --- .../src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt | 4 ++-- .../src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'build-logic/src/main/kotlin/app') diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt index 53c93f6c..82211f40 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt @@ -33,8 +33,8 @@ object AndroidCommon { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } testOptions { diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt index e70b9ccf..5052be3c 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt @@ -23,12 +23,12 @@ class KotlinCommonPlugin : Plugin { val isAppModule = project.pluginManager.hasPlugin("com.android.application") project.tasks.run { withType().configureEach { - sourceCompatibility = JavaVersion.VERSION_11.toString() - targetCompatibility = JavaVersion.VERSION_11.toString() + sourceCompatibility = JavaVersion.VERSION_17.toString() + targetCompatibility = JavaVersion.VERSION_17.toString() } withType().configureEach task@{ compilerOptions { - jvmTarget.set(JvmTarget.JVM_11) + jvmTarget.set(JvmTarget.JVM_17) allWarningsAsErrors.set(true) languageVersion.set(KotlinVersion.KOTLIN_1_8) freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS) -- cgit v1.2.3