Skip to content

Commit b7da592

Browse files
authored
Update multiple flutters benchmark test to latest gradle and agp and gradle defined dependencies (#164029)
part of #149836 After this pr and flutter/flutter#163849 are merged `find . -type f -name "build.gradle" | xargs grep -e "targetSdk" | tr -d '=' | tr -s ' ' | grep -v engine/src/flutter/third_party/ | grep -v 35 | grep -v flutter\.targetSdkVersion` will return no results. Marking everything migrated to 35. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing.
1 parent 72bedb3 commit b7da592

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

dev/benchmarks/multiple_flutters/android/app/build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
}
1515

1616
namespace "dev.flutter.multipleflutters"
17-
compileSdk 34
17+
compileSdk 35
1818

1919
// Flutter's CI installs the NDK at a non-standard path.
2020
// This non-standard structure is initially created by
@@ -26,18 +26,18 @@ android {
2626
}
2727

2828
compileOptions {
29-
sourceCompatibility JavaVersion.VERSION_1_8
30-
targetCompatibility JavaVersion.VERSION_1_8
29+
sourceCompatibility JavaVersion.VERSION_17
30+
targetCompatibility JavaVersion.VERSION_17
3131
}
3232

3333
kotlinOptions {
34-
jvmTarget = '1.8'
34+
jvmTarget = '17'
3535
}
3636

3737
defaultConfig {
3838
applicationId "dev.flutter.multipleflutters"
3939
minSdkVersion 24
40-
targetSdkVersion 33
40+
targetSdkVersion 35
4141
versionCode 1
4242
versionName "1.0"
4343

@@ -56,12 +56,12 @@ android {
5656
dependencies {
5757

5858
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
59-
implementation 'androidx.core:core-ktx:1.2.0'
60-
implementation 'androidx.appcompat:appcompat:1.1.0'
61-
implementation 'com.google.android.material:material:1.1.0'
62-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
59+
implementation 'androidx.core:core-ktx:1.15.0'
60+
implementation 'androidx.appcompat:appcompat:1.7.0'
61+
implementation 'com.google.android.material:material:1.12.0'
62+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
6363
testImplementation 'junit:junit:4.+'
64-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
65-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
64+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
65+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
6666
implementation project(':flutter')
6767
}

dev/benchmarks/multiple_flutters/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
// Top-level build file where you can add configuration options common to all sub-projects/modules.
66
buildscript {
7-
ext.kotlin_version = "1.7.10"
7+
ext.kotlin_version = "2.1.0"
88
repositories {
99
google()
1010
mavenCentral()
1111
}
1212
dependencies {
13-
classpath "com.android.tools.build:gradle:8.1.0"
13+
classpath 'com.android.tools.build:gradle:8.8.1'
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515

1616
// Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Sep 27 5:06 AM PST 2022
1+
#Mon Feb 24 15:28:21 EST 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

0 commit comments

Comments
 (0)