Skip to content

Commit c79a62e

Browse files
committed
Bump AGP and migrate deprecated JvmTarget to the new toolchain option.
AGP 8.10.1 -> 8.11.1 Koltin 2.0.21 -> 2.2.0 Grale 8.11 -> 8.13 Remove kotlin option in favor of java toolchain see : - https://docs.gradle.org/current/userguide/toolchains.html - https://docs.gradle.org/current/userguide/upgrading_version_7.html#kotlin_dsl_plugin_toolchains - https://docs.gradle.org/current/userguide/kotlin_dsl.html#sec:kotlin-dsl_plugin
1 parent 2036f08 commit c79a62e

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

android/app/build.gradle.kts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ plugins {
88
id("dev.flutter.flutter-gradle-plugin")
99
}
1010

11+
java {
12+
toolchain {
13+
languageVersion = JavaLanguageVersion.of(17)
14+
}
15+
}
1116
// https://docs.flutter.dev/deployment/android#configure-signing-in-gradle
1217
val keystoreProperties = Properties()
1318
val keystorePropertiesFile = rootProject.file("key.properties")
@@ -30,10 +35,6 @@ android {
3035
targetCompatibility = JavaVersion.VERSION_17
3136
}
3237

33-
kotlinOptions {
34-
jvmTarget = JavaVersion.VERSION_17.toString()
35-
}
36-
3738
defaultConfig {
3839
applicationId = "com.piwigo.piwigo_ng"
3940
multiDexEnabled = true

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip

android/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21-
id("com.android.application") version "8.10.1" apply false
22-
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
21+
id("com.android.application") version "8.11.1" apply false
22+
id("org.jetbrains.kotlin.android") version "2.2.0" apply false
2323
}
2424

2525
include(":app")

0 commit comments

Comments
 (0)