Unverified Commit ae750e57 authored by gmackall's avatar gmackall Committed by GitHub

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

Partially fixes/related to: https://github.com/flutter/flutter/issues/131425
parent 972d36c4
...@@ -14,7 +14,7 @@ android { ...@@ -14,7 +14,7 @@ android {
} }
namespace "dev.flutter.multipleflutters" namespace "dev.flutter.multipleflutters"
compileSdkVersion 31 compileSdkVersion 33
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
...@@ -28,7 +28,7 @@ android { ...@@ -28,7 +28,7 @@ android {
defaultConfig { defaultConfig {
applicationId "dev.flutter.multipleflutters" applicationId "dev.flutter.multipleflutters"
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 31 targetSdkVersion 33
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
......
...@@ -15,7 +15,7 @@ android { ...@@ -15,7 +15,7 @@ android {
defaultConfig { defaultConfig {
applicationId "io.flutter.add2app" applicationId "io.flutter.add2app"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 31 targetSdkVersion 33
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }
......
...@@ -15,7 +15,7 @@ android { ...@@ -15,7 +15,7 @@ android {
defaultConfig { defaultConfig {
applicationId "io.flutter.add2app" applicationId "io.flutter.add2app"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 31 targetSdkVersion 33
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }
......
...@@ -24,7 +24,7 @@ apply plugin: "com.android.dynamic-feature" ...@@ -24,7 +24,7 @@ apply plugin: "com.android.dynamic-feature"
android { android {
namespace "io.flutter.integration.deferred_components_test.component1" namespace "io.flutter.integration.deferred_components_test.component1"
compileSdkVersion 31 compileSdkVersion 33
sourceSets { sourceSets {
applicationVariants.all { variant -> applicationVariants.all { variant ->
...@@ -35,7 +35,7 @@ android { ...@@ -35,7 +35,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 31 targetSdkVersion 33
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
} }
......
...@@ -15,7 +15,7 @@ android { ...@@ -15,7 +15,7 @@ android {
defaultConfig { defaultConfig {
applicationId "io.flutter.addtoapp" applicationId "io.flutter.addtoapp"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 31 targetSdkVersion 33
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }
......
...@@ -34,8 +34,8 @@ android { ...@@ -34,8 +34,8 @@ android {
} }
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion flutter.minSdkVersion
targetSdkVersion 31 targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
} }
......
...@@ -1617,7 +1617,7 @@ String gradleFileWithApplicationId(String id) { ...@@ -1617,7 +1617,7 @@ String gradleFileWithApplicationId(String id) {
return ''' return '''
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 31 compileSdkVersion 33
defaultConfig { defaultConfig {
applicationId '$id' applicationId '$id'
...@@ -1634,7 +1634,7 @@ version '1.0-SNAPSHOT' ...@@ -1634,7 +1634,7 @@ version '1.0-SNAPSHOT'
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 31 compileSdkVersion 33
} }
'''; ''';
} }
......
...@@ -77,7 +77,7 @@ class DeferredComponentModule { ...@@ -77,7 +77,7 @@ class DeferredComponentModule {
apply plugin: "com.android.dynamic-feature" apply plugin: "com.android.dynamic-feature"
android { android {
compileSdkVersion 31 compileSdkVersion 33
sourceSets { sourceSets {
applicationVariants.all { variant -> applicationVariants.all { variant ->
...@@ -88,7 +88,7 @@ class DeferredComponentModule { ...@@ -88,7 +88,7 @@ class DeferredComponentModule {
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 31 targetSdkVersion 33
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
} }
......
...@@ -144,7 +144,7 @@ class MultidexProject extends Project { ...@@ -144,7 +144,7 @@ class MultidexProject extends Project {
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android { android {
compileSdkVersion 31 compileSdkVersion 33
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
...@@ -163,7 +163,7 @@ class MultidexProject extends Project { ...@@ -163,7 +163,7 @@ class MultidexProject extends Project {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.multidextest2" applicationId "com.example.multidextest2"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 30 targetSdkVersion 33
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment