mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-09-02 15:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(build): raise target bytecode to Java 17

Browse Source
This commit is contained in:
Harsh Shandilya
2023-05-16 15:54:35 +05:30
parent 76efe73e28
commit 72696ae557
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build-logic/build.gradle.kts
View File

@@ -10,13 +10,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { `kotlin-dsl` } plugins { `kotlin-dsl` }
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = JavaVersion.VERSION_11.toString() sourceCompatibility = JavaVersion.VERSION_17.toString()
targetCompatibility = JavaVersion.VERSION_11.toString() targetCompatibility = JavaVersion.VERSION_17.toString()
} }
tasks.withType<KotlinCompile>().configureEach { tasks.withType<KotlinCompile>().configureEach {
kotlinOptions { kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString() jvmTarget = JavaVersion.VERSION_17.toString()
freeCompilerArgs = freeCompilerArgs =
freeCompilerArgs + freeCompilerArgs +
listOf( listOf(

4
build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
View File

@@ -33,8 +33,8 @@ object AndroidCommon {
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_17
} }
testOptions { testOptions {

6
build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt
View File

@@ -23,12 +23,12 @@ class KotlinCommonPlugin : Plugin<Project> {
val isAppModule = project.pluginManager.hasPlugin("com.android.application") val isAppModule = project.pluginManager.hasPlugin("com.android.application")
project.tasks.run { project.tasks.run {
withType<JavaCompile>().configureEach { withType<JavaCompile>().configureEach {
sourceCompatibility = JavaVersion.VERSION_11.toString() sourceCompatibility = JavaVersion.VERSION_17.toString()
targetCompatibility = JavaVersion.VERSION_11.toString() targetCompatibility = JavaVersion.VERSION_17.toString()
} }
withType<KotlinCompile>().configureEach task@{ withType<KotlinCompile>().configureEach task@{
compilerOptions { compilerOptions {
jvmTarget.set(JvmTarget.JVM_11) jvmTarget.set(JvmTarget.JVM_17)
allWarningsAsErrors.set(true) allWarningsAsErrors.set(true)
languageVersion.set(KotlinVersion.KOTLIN_1_8) languageVersion.set(KotlinVersion.KOTLIN_1_8)
freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS) freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS)