Upgrade compile and target sdk versions in tests and benchmarks (#131428)

Partially fixes/related to: https://github.com/flutter/flutter/issues/131425

Upgrade compile and target sdk versions in tests and benchmarks (#131428)
Partially fixes/related to: https://github.com/flutter/flutter/issues/131425
ae750e57 · gmackall · GitHub · 972d36c4 · ae750e57 · ae750e57
Unverified Commit ae750e57 authored Jul 31, 2023 by gmackall Committed by GitHub Jul 31, 2023
9 changed files
--- a/dev/benchmarks/multiple_flutters/android/app/build.gradle
+++ b/dev/benchmarks/multiple_flutters/android/app/build.gradle
@@ -14,7 +14,7 @@ android {
    }

    namespace "dev.flutter.multipleflutters"
-    compileSdkVersion 31
+    compileSdkVersion 33

    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
@@ -28,7 +28,7 @@ android {
    defaultConfig {
        applicationId "dev.flutter.multipleflutters"
        minSdkVersion 24
-        targetSdkVersion 31
+        targetSdkVersion 33
        versionCode 1
        versionName "1.0"


--- a/dev/integration_tests/android_custom_host_app/SampleApp/build.gradle
+++ b/dev/integration_tests/android_custom_host_app/SampleApp/build.gradle
@@ -15,7 +15,7 @@ android {
    defaultConfig {
        applicationId "io.flutter.add2app"
        minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 33
        versionCode 1
        versionName "1.0"
    }

--- a/dev/integration_tests/android_host_app_v2_embedding/app/build.gradle
+++ b/dev/integration_tests/android_host_app_v2_embedding/app/build.gradle
@@ -15,7 +15,7 @@ android {
    defaultConfig {
        applicationId "io.flutter.add2app"
        minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 33
        versionCode 1
        versionName "1.0"
    }

--- a/dev/integration_tests/deferred_components_test/android/component1/build.gradle
+++ b/dev/integration_tests/deferred_components_test/android/component1/build.gradle
@@ -24,7 +24,7 @@ apply plugin: "com.android.dynamic-feature"

 android {
    namespace "io.flutter.integration.deferred_components_test.component1"
-    compileSdkVersion 31
+    compileSdkVersion 33

    sourceSets {
        applicationVariants.all { variant ->
@@ -35,7 +35,7 @@ android {

    defaultConfig {
        minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 33
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
    }

--- a/dev/integration_tests/module_host_with_custom_build_v2_embedding/app/build.gradle
+++ b/dev/integration_tests/module_host_with_custom_build_v2_embedding/app/build.gradle
@@ -15,7 +15,7 @@ android {
    defaultConfig {
        applicationId "io.flutter.addtoapp"
        minSdkVersion 19
-        targetSdkVersion 31
+        targetSdkVersion 33
        versionCode 1
        versionName "1.0"
    }

--- a/packages/flutter_tools/templates/module/android/deferred_component/build.gradle.tmpl
+++ b/packages/flutter_tools/templates/module/android/deferred_component/build.gradle.tmpl
@@ -34,8 +34,8 @@ android {
    }

    defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 31
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
    }

--- a/packages/flutter_tools/test/general.shard/project_test.dart
+++ b/packages/flutter_tools/test/general.shard/project_test.dart
@@ -1617,7 +1617,7 @@ String gradleFileWithApplicationId(String id) {
  return '''
 apply plugin: 'com.android.application'
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33

    defaultConfig {
        applicationId '$id'
@@ -1634,7 +1634,7 @@ version '1.0-SNAPSHOT'
 apply plugin: 'com.android.library'

 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 }
 ''';
 }

--- a/packages/flutter_tools/test/integration.shard/test_data/deferred_components_config.dart
+++ b/packages/flutter_tools/test/integration.shard/test_data/deferred_components_config.dart
@@ -77,7 +77,7 @@ class DeferredComponentModule {
    apply plugin: "com.android.dynamic-feature"

    android {
-        compileSdkVersion 31
+        compileSdkVersion 33

        sourceSets {
            applicationVariants.all { variant ->
@@ -88,7 +88,7 @@ class DeferredComponentModule {

        defaultConfig {
            minSdkVersion 19
-            targetSdkVersion 31
+            targetSdkVersion 33
            versionCode flutterVersionCode.toInteger()
            versionName flutterVersionName
        }

--- a/packages/flutter_tools/test/integration.shard/test_data/multidex_project.dart
+++ b/packages/flutter_tools/test/integration.shard/test_data/multidex_project.dart
@@ -144,7 +144,7 @@ class MultidexProject extends Project {
  apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

  android {
-      compileSdkVersion 31
+      compileSdkVersion 33

      compileOptions {
          sourceCompatibility JavaVersion.VERSION_1_8
@@ -163,7 +163,7 @@ class MultidexProject extends Project {
          // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
          applicationId "com.example.multidextest2"
          minSdkVersion 19
-          targetSdkVersion 30
+          targetSdkVersion 33
          versionCode flutterVersionCode.toInteger()
          versionName flutterVersionName
      }