Skip to content

Commit

Permalink
Upgrade Java version from 11 to 17
Browse files Browse the repository at this point in the history
This is needed by the upcoming addition of a dependency to enable scatter plots. Tests with an emulated AOSP device using min API 24 were successful.

This is a best guess as to correlation between Android API versions the Java versions is somewhat complicated.
  • Loading branch information
meikpiep committed Sep 14, 2024
1 parent 23c1fc4 commit 7070487
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions gauguin-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

testOptions {
Expand Down Expand Up @@ -114,17 +114,17 @@ repositories {
jcenter()
}

java.toolchain.languageVersion.set(JavaLanguageVersion.of(11))
java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))

kotlin {
jvmToolchain(11)
}

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
languageVersion.set(JavaLanguageVersion.of(17))
}
}

Expand Down
8 changes: 4 additions & 4 deletions gauguin-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ dependencies {
}

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
jvmToolchain(11)
jvmToolchain(17)
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
languageVersion.set(JavaLanguageVersion.of(17))
}
}

Expand Down

0 comments on commit 7070487

Please sign in to comment.