songsenand
/
flet-build-template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.70.0 AGP/Kotlin update for Android (#55) 

* Update Android build to Gradle 8.10.2 and Kotlin 2.0.20

Upgraded Gradle wrapper to 8.10.2 and updated Android Gradle plugin to 8.6.1. Migrated Kotlin plugin to org.jetbrains.kotlin.android version 2.0.20 and set Java compatibility to 11. Removed legacy buildscript block for Kotlin in build.gradle for improved build configuration.

* Update Java and Kotlin compatibility to version 17

Changed source and target compatibility for Java and Kotlin from version 11 to 17 in build.gradle to support newer language features and improve compatibility with modern tooling.

* Update Kotlin Android plugin to version 2.1.0

Bumped the org.jetbrains.kotlin.android Gradle plugin from 2.0.20 to 2.1.0 in settings.gradle to use the latest features and improvements.
This commit is contained in:
Feodor Fitsner 2025-10-20 10:54:50 -07:00 committed by GitHub
parent 7fa867f7a4
commit 2bc7e34ee6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
{{cookiecutter.out_dir}}/android/app/build.gradle
View File

@ -1,6 +1,6 @@
plugins { plugins {
id "com.android.application" id "com.android.application"
id "kotlin-android" id "org.jetbrains.kotlin.android"
id "dev.flutter.flutter-gradle-plugin" id "dev.flutter.flutter-gradle-plugin"
} }
@ -37,12 +37,12 @@ android {
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_17
} }
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = '17'
} }
sourceSets { sourceSets {
@ -102,4 +102,4 @@ flutter {
source '../..' source '../..'
} }
dependencies {} dependencies {}

14
{{cookiecutter.out_dir}}/android/build.gradle
View File

@ -1,15 +1,3 @@
buildscript {
ext.kotlin_version = '1.9.24'
repositories {
google()
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects { allprojects {
repositories { repositories {
google() google()
@ -27,4 +15,4 @@ subprojects {
tasks.register("clean", Delete) { tasks.register("clean", Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }

2
{{cookiecutter.out_dir}}/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip

5
{{cookiecutter.out_dir}}/android/settings.gradle
View File

@ -23,7 +23,8 @@ pluginManagement {
plugins { plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.3.1" apply false id "com.android.application" version "8.6.1" apply false
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
} }
include ":app" include ":app"