summaryrefslogtreecommitdiff
path: root/build-logic/src/main
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2023-05-16 15:54:35 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2023-05-16 15:54:35 +0530
commit72696ae557f6f156fb13f68e1cdb33cbea6d4b44 (patch)
tree0b2c048572ea4f563ce883fe22f7ce561851ed3d /build-logic/src/main
parent76efe73e281da218fcefa7b86838bd3be50c9563 (diff)
feat(build): raise target bytecode to Java 17
Diffstat (limited to 'build-logic/src/main')
-rw-r--r--build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt4
-rw-r--r--build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt6
2 files changed, 5 insertions, 5 deletions
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)