bump JDK version
This commit is contained in:
parent
3baea40669
commit
56bb75866c
2 changed files with 5 additions and 9 deletions
|
|
@ -19,13 +19,9 @@ android {
|
|||
compileSdk = 36
|
||||
ndkVersion = flutter.ndkVersion
|
||||
|
||||
lint {
|
||||
disable += setOf("EasterEgg", "StopShip")
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
sourceCompatibility = JavaVersion.VERSION_21
|
||||
targetCompatibility = JavaVersion.VERSION_21
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
|
|
@ -69,7 +65,7 @@ android {
|
|||
|
||||
kotlin {
|
||||
compilerOptions {
|
||||
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
|
||||
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ pkgs.mkShell {
|
|||
[
|
||||
go
|
||||
git
|
||||
jdk17
|
||||
|
||||
libGL
|
||||
(flutter.override {
|
||||
extraPkgConfigPackages = [
|
||||
|
|
@ -40,7 +40,7 @@ pkgs.mkShell {
|
|||
|
||||
ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
|
||||
ANDROID_SDK_ROOT = ANDROID_HOME;
|
||||
JAVA_HOME = pkgs.jdk17;
|
||||
JAVA_HOME = pkgs.jdk21;
|
||||
|
||||
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_HOME}/build-tools/36.0.0/aapt2";
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue