Skip to content

Commit

Permalink
pure_android_host_apps android versions update (flutter#163617)
Browse files Browse the repository at this point in the history
- **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
  • Loading branch information
reidbaker authored Feb 24, 2025
1 parent 0102da9 commit e2c4ba3
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ unlinked_spec.ds
**/android/captures/
**/android/gradlew
**/android/gradlew.bat
**/android/local.properties
**/android/**/GeneratedPluginRegistrant.java
**/android/key.properties
*.jks
local.properties

# iOS/XCode related
**/ios/**/*.mode1v3
Expand Down
2 changes: 2 additions & 0 deletions dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ Future<void> main() async {
'intermediates',
'assets',
'debug',
'mergeDebugAssets',
'flutter_assets',
'assets',
'read-only.txt',
Expand Down Expand Up @@ -315,6 +316,7 @@ Future<void> main() async {
'intermediates',
'assets',
'release',
'mergeReleaseAssets',
'flutter_assets',
'assets',
'read-only.txt',
Expand Down
2 changes: 2 additions & 0 deletions dev/integration_tests/pure_android_host_apps/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Name for module used in integration test that should not be checked in.
hello/
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
Android host app for a Flutter module created using
```sh
$ flutter create -t module hello
$ cd hello
$ flutter build aar
```
and placed in a sibling folder to (a clone of) the host app.
Used by the `module_custom_host_app_name_test.dart` device lab test.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apply plugin: 'com.android.application'

android {
namespace = "io.flutter.add2app"
compileSdk 34
compileSdk = 35

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

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

defaultConfig {
applicationId "io.flutter.add2app"
minSdkVersion 21
targetSdkVersion 34
minSdk = 21
targetSdk = 35
versionCode 1
versionName "1.0"
}
}

dependencies {
implementation project(':flutter')
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.appcompat:appcompat:1.7.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.0'
classpath 'com.android.tools.build:gradle:8.8.1'
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Tue Feb 18 12:03:21 EST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

0 comments on commit e2c4ba3

Please sign in to comment.