diff --git a/android/app/build.gradle b/android/app/build.gradle index c2898032..4bfa5901 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -43,7 +43,7 @@ android { } kotlinOptions { - jvmTarget = '24' + jvmTarget = JavaVersion.VERSION_18.toString() } sourceSets { diff --git a/android/build.gradle b/android/build.gradle index b42eb3a7..e4ce7a00 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,6 +9,16 @@ rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" project.evaluationDependsOn(':app') + + // Skip lint on release builds. The `lintVital*` tasks run lint on every + // module (including third-party Flutter plugins) during release assembly + // and provide little value here, while repeatedly breaking the build + // (e.g. AndroidLintWorkAction failing to initialize on JDK 21). Disabling + // the tasks lazily avoids evaluation-order issues with the + // `evaluationDependsOn(':app')` above. + project.tasks.matching { it.name.startsWith('lintVital') }.configureEach { + it.enabled = false + } } tasks.register("clean", Delete) { diff --git a/android/gradle.properties b/android/gradle.properties index 1f8a3781..54fe6380 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,6 +1,6 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx2048M --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED android.useAndroidX=true -android.enableJetifier=true +android.enableJetifier=false kotlin.jvm.target.validation.mode = IGNORE # This builtInKotlin flag was added automatically by Flutter migrator android.builtInKotlin=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 37f853b1..d4081da4 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME