Skip to content

Commit e2c4ba3

Browse files
authored
pure_android_host_apps android versions update (flutter#163617)
- **update pure_android_host_apps/android_custom_host_app to compileSdk/targetSdk 35, newest stable agp and gradle versions, update source compatibility to java 17, updated dependencies** - **Update documentation and migrate compileSdkVersion to compileSdk** - **Update gitignore to ignore specific module folder name and local.properties repo wide** Related to flutter#149836 ## 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. [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent 0102da9 commit e2c4ba3

File tree

7 files changed

+16
-9
lines changed

7 files changed

+16
-9
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ unlinked_spec.ds
7474
**/android/captures/
7575
**/android/gradlew
7676
**/android/gradlew.bat
77-
**/android/local.properties
7877
**/android/**/GeneratedPluginRegistrant.java
7978
**/android/key.properties
8079
*.jks
80+
local.properties
8181

8282
# iOS/XCode related
8383
**/ios/**/*.mode1v3

dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ Future<void> main() async {
242242
'intermediates',
243243
'assets',
244244
'debug',
245+
'mergeDebugAssets',
245246
'flutter_assets',
246247
'assets',
247248
'read-only.txt',
@@ -315,6 +316,7 @@ Future<void> main() async {
315316
'intermediates',
316317
'assets',
317318
'release',
319+
'mergeReleaseAssets',
318320
'flutter_assets',
319321
'assets',
320322
'read-only.txt',
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Name for module used in integration test that should not be checked in.
2+
hello/

dev/integration_tests/pure_android_host_apps/android_custom_host_app/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
Android host app for a Flutter module created using
44
```sh
55
$ flutter create -t module hello
6+
$ cd hello
7+
$ flutter build aar
68
```
79
and placed in a sibling folder to (a clone of) the host app.
810
Used by the `module_custom_host_app_name_test.dart` device lab test.

dev/integration_tests/pure_android_host_apps/android_custom_host_app/SampleApp/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'com.android.application'
66

77
android {
88
namespace = "io.flutter.add2app"
9-
compileSdk 34
9+
compileSdk = 35
1010

1111
// Flutter's CI installs the NDK at a non-standard path.
1212
// This non-standard structure is initially created by
@@ -18,20 +18,20 @@ android {
1818
}
1919

2020
compileOptions {
21-
sourceCompatibility JavaVersion.VERSION_1_8
22-
targetCompatibility JavaVersion.VERSION_1_8
21+
sourceCompatibility JavaVersion.VERSION_17
22+
targetCompatibility JavaVersion.VERSION_17
2323
}
2424

2525
defaultConfig {
2626
applicationId "io.flutter.add2app"
27-
minSdkVersion 21
28-
targetSdkVersion 34
27+
minSdk = 21
28+
targetSdk = 35
2929
versionCode 1
3030
versionName "1.0"
3131
}
3232
}
3333

3434
dependencies {
3535
implementation project(':flutter')
36-
implementation 'androidx.appcompat:appcompat:1.1.0'
36+
implementation 'androidx.appcompat:appcompat:1.7.0'
3737
}

dev/integration_tests/pure_android_host_apps/android_custom_host_app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
mavenCentral()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.1.0'
11+
classpath 'com.android.tools.build:gradle:8.8.1'
1212
}
1313
}
1414

dev/integration_tests/pure_android_host_apps/android_custom_host_app/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Tue Feb 18 12:03:21 EST 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
35
zipStoreBase=GRADLE_USER_HOME
46
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

0 commit comments

Comments
 (0)