From 72696ae557f6f156fb13f68e1cdb33cbea6d4b44 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Tue, 16 May 2023 15:54:35 +0530
Subject: feat(build): raise target bytecode to Java 17

---
 build-logic/build.gradle.kts                                        | 6 +++---
 .../src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt       | 4 ++--
 .../src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'build-logic')

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 14130749..0f3d9342 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -10,13 +10,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins { `kotlin-dsl` }
 
 tasks.withType<JavaCompile>().configureEach {
-  sourceCompatibility = JavaVersion.VERSION_11.toString()
-  targetCompatibility = JavaVersion.VERSION_11.toString()
+  sourceCompatibility = JavaVersion.VERSION_17.toString()
+  targetCompatibility = JavaVersion.VERSION_17.toString()
 }
 
 tasks.withType<KotlinCompile>().configureEach {
   kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.toString()
+    jvmTarget = JavaVersion.VERSION_17.toString()
     freeCompilerArgs =
       freeCompilerArgs +
         listOf(
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<Project> {
     val isAppModule = project.pluginManager.hasPlugin("com.android.application")
     project.tasks.run {
       withType<JavaCompile>().configureEach {
-        sourceCompatibility = JavaVersion.VERSION_11.toString()
-        targetCompatibility = JavaVersion.VERSION_11.toString()
+        sourceCompatibility = JavaVersion.VERSION_17.toString()
+        targetCompatibility = JavaVersion.VERSION_17.toString()
       }
       withType<KotlinCompile>().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