From a8d02fbc7af18fa35379426c4b62955d87474757 Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Fri, 14 Feb 2025 11:43:36 -0500 Subject: [PATCH] Update android samples to target/compile android 35 and AGP/Gradle updates (#2587) - **update AGP and gradle versions** - **[prebuilt_module] update agp and gradle** - **[prebuilt_module] targetsdk and jvm compatabiliity** Fixes flutter/flutter/152374 --- .../android_using_plugin/app/build.gradle | 21 +++++++++---------- .../plugin/android_using_plugin/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../app/build.gradle | 10 ++++----- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/add_to_app/plugin/android_using_plugin/app/build.gradle b/add_to_app/plugin/android_using_plugin/app/build.gradle index 546c701bb..f8586e563 100644 --- a/add_to_app/plugin/android_using_plugin/app/build.gradle +++ b/add_to_app/plugin/android_using_plugin/app/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "dev.flutter.example.androidusingplugin" minSdkVersion 21 - targetSdk 34 + targetSdk 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -17,28 +17,27 @@ android { minifyEnabled false } } - // Remove when #flutter/flutter/issues/150955 is merged to stable. - lintOptions { - checkReleaseBuilds false - } // Keep java and kotlin versions in sync. compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility 17 + targetCompatibility 17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } namespace 'dev.flutter.example.androidusingplugin' + lint { + checkReleaseBuilds false + } } dependencies { implementation project(':flutter') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.core:core-ktx:1.13.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.core:core-ktx:1.15.0' + implementation 'androidx.constraintlayout:constraintlayout:2.2.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.2.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' diff --git a/add_to_app/plugin/android_using_plugin/build.gradle b/add_to_app/plugin/android_using_plugin/build.gradle index 2097733f9..b74e93336 100644 --- a/add_to_app/plugin/android_using_plugin/build.gradle +++ b/add_to_app/plugin/android_using_plugin/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.3.2' + classpath 'com.android.tools.build:gradle:8.8.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties b/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties index 17655d0ef..81aa1c044 100644 --- a/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties +++ b/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle index 95bbdffb7..676223f68 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "dev.flutter.example.androidusingprebuiltmodule" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -19,11 +19,11 @@ android { } } compileOptions { - sourceCompatibility 1.8 - targetCompatibility 1.8 + sourceCompatibility 17 + targetCompatibility 17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } namespace 'dev.flutter.example.androidusingprebuiltmodule' } diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle b/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle index 2097733f9..b74e93336 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.3.2' + classpath 'com.android.tools.build:gradle:8.8.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties b/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties index 17655d0ef..81aa1c044 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists