Merge branch 'master' into feat/dart-define-embedded

# Conflicts: # .github/workflows/cronet.yml # pkgs/cronet_http/android/build.gradle # pkgs/cronet_http/example/android/app/build.gradle # pkgs/cronet_http/tool/prepare_for_embedded.dart
dart-lang · Jan 12, 2024 · 13849c2 · 13849c2
2 parents 1339348 + c2a6d64
commit 13849c2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/cronet.yml b/.github/workflows/cronet.yml
@@ -56,7 +56,8 @@ jobs:
           # - .github/workflows/cronet.yml
           # - pkgs/cronet_http/android/build.gradle
           # - pkgs/cronet_http/example/android/app/build.gradle
-          api-level: 28
+          api-level: 21
+          arch: x86_64
           target: ${{ matrix.cronetHttpNoPlay == 'true' && 'default' || 'google_apis' }}
           profile: pixel
           script: cd pkgs/cronet_http/example && flutter test --dart-define=cronetHttpNoPlay=${{ matrix.cronetHttpNoPlay }} --timeout=1200s integration_test/
diff --git a/pkgs/cronet_http/CHANGELOG.md b/pkgs/cronet_http/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 1.0.1-wip
 
 * Use `package:http_image_provider` in the example application.
+* Support Android API 21+.
 
 ## 1.0.0
 

diff --git a/pkgs/cronet_http/android/build.gradle b/pkgs/cronet_http/android/build.gradle
@@ -61,7 +61,7 @@ android {
         // - .github/workflows/cronet.yml
         // - pkgs/cronet_http/android/build.gradle
         // - pkgs/cronet_http/example/android/app/build.gradle
-        minSdkVersion 28
+        minSdkVersion 21
     }
 
     defaultConfig {

diff --git a/pkgs/cronet_http/example/android/app/build.gradle b/pkgs/cronet_http/example/android/app/build.gradle
@@ -44,13 +44,11 @@ android {
 
     defaultConfig {
         applicationId "io.flutter.cronet_http_example"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         // api-level/minSdkVersion should be help in sync in:
         // - .github/workflows/cronet.yml
         // - pkgs/cronet_http/android/build.gradle
         // - pkgs/cronet_http/example/android/app/build.gradle
-        minSdkVersion 28
+        minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -70,6 +68,8 @@ flutter {
 }
 
 dependencies {
+    // TODO(#1112): org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
+    // This should be removed when https://github.com/flutter/flutter/issues/125062 is fixed.
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     // ""com.google.android.gms:play-services-cronet" is only present so that
     // `jnigen` will work. Applications should not include this line.