pure_android_host_apps android versions update (#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 #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
This commit is contained in:
parent
0102da95cd
commit
e2c4ba31b8
2
.gitignore
vendored
2
.gitignore
vendored
@ -74,10 +74,10 @@ unlinked_spec.ds
|
|||||||
**/android/captures/
|
**/android/captures/
|
||||||
**/android/gradlew
|
**/android/gradlew
|
||||||
**/android/gradlew.bat
|
**/android/gradlew.bat
|
||||||
**/android/local.properties
|
|
||||||
**/android/**/GeneratedPluginRegistrant.java
|
**/android/**/GeneratedPluginRegistrant.java
|
||||||
**/android/key.properties
|
**/android/key.properties
|
||||||
*.jks
|
*.jks
|
||||||
|
local.properties
|
||||||
|
|
||||||
# iOS/XCode related
|
# iOS/XCode related
|
||||||
**/ios/**/*.mode1v3
|
**/ios/**/*.mode1v3
|
||||||
|
@ -242,6 +242,7 @@ Future<void> main() async {
|
|||||||
'intermediates',
|
'intermediates',
|
||||||
'assets',
|
'assets',
|
||||||
'debug',
|
'debug',
|
||||||
|
'mergeDebugAssets',
|
||||||
'flutter_assets',
|
'flutter_assets',
|
||||||
'assets',
|
'assets',
|
||||||
'read-only.txt',
|
'read-only.txt',
|
||||||
@ -315,6 +316,7 @@ Future<void> main() async {
|
|||||||
'intermediates',
|
'intermediates',
|
||||||
'assets',
|
'assets',
|
||||||
'release',
|
'release',
|
||||||
|
'mergeReleaseAssets',
|
||||||
'flutter_assets',
|
'flutter_assets',
|
||||||
'assets',
|
'assets',
|
||||||
'read-only.txt',
|
'read-only.txt',
|
||||||
|
2
dev/integration_tests/pure_android_host_apps/.gitignore
vendored
Normal file
2
dev/integration_tests/pure_android_host_apps/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
# Name for module used in integration test that should not be checked in.
|
||||||
|
hello/
|
@ -3,6 +3,8 @@
|
|||||||
Android host app for a Flutter module created using
|
Android host app for a Flutter module created using
|
||||||
```sh
|
```sh
|
||||||
$ flutter create -t module hello
|
$ flutter create -t module hello
|
||||||
|
$ cd hello
|
||||||
|
$ flutter build aar
|
||||||
```
|
```
|
||||||
and placed in a sibling folder to (a clone of) the host app.
|
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.
|
Used by the `module_custom_host_app_name_test.dart` device lab test.
|
||||||
|
@ -6,7 +6,7 @@ apply plugin: 'com.android.application'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "io.flutter.add2app"
|
namespace = "io.flutter.add2app"
|
||||||
compileSdk 34
|
compileSdk = 35
|
||||||
|
|
||||||
// Flutter's CI installs the NDK at a non-standard path.
|
// Flutter's CI installs the NDK at a non-standard path.
|
||||||
// This non-standard structure is initially created by
|
// This non-standard structure is initially created by
|
||||||
@ -18,14 +18,14 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_17
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "io.flutter.add2app"
|
applicationId "io.flutter.add2app"
|
||||||
minSdkVersion 21
|
minSdk = 21
|
||||||
targetSdkVersion 34
|
targetSdk = 35
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
}
|
}
|
||||||
@ -33,5 +33,5 @@ android {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation project(':flutter')
|
implementation project(':flutter')
|
||||||
implementation 'androidx.appcompat:appcompat:1.1.0'
|
implementation 'androidx.appcompat:appcompat:1.7.0'
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:8.1.0'
|
classpath 'com.android.tools.build:gradle:8.8.1'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
|
#Tue Feb 18 12:03:21 EST 2025
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user