Skip to content

Commit d43ea8c

Browse files
auto-submit[bot]pull[bot]
authored andcommitted
Reverts "[Android] Support Android 34" (flutter#137865)
Reverts flutter#137191 Initiated by: camsim99 This change reverts the following previous change: Original Description: Adds support for Android 34 in the following ways: - Bumps integration tests compile SDK versions 33 --> 34 - Bumps template compile SDK version 33 --> 34 - Also changes deprecated `compileSdkVersion` to `compileSdk` Part of flutter#134220
1 parent 2ee102e commit d43ea8c

File tree

60 files changed

+78
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+78
-78
lines changed

dev/a11y_assessments/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if (flutterVersionName == null) {
2828

2929
android {
3030
namespace "com.example.a11y_assessments"
31-
compileSdk flutter.compileSdkVersion
31+
compileSdkVersion flutter.compileSdkVersion
3232
ndkVersion flutter.ndkVersion
3333

3434
compileOptions {

dev/benchmarks/complex_layout/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2020

2121
android {
2222
namespace "com.yourcompany.complexLayout"
23-
compileSdk flutter.compileSdkVersion
23+
compileSdkVersion flutter.compileSdkVersion
2424

2525
compileOptions {
2626
sourceCompatibility JavaVersion.VERSION_11

dev/benchmarks/macrobenchmarks/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3030

3131
android {
3232
namespace "com.example.macrobenchmarks"
33-
compileSdk flutter.compileSdkVersion
33+
compileSdkVersion flutter.compileSdkVersion
3434

3535
compileOptions {
3636
sourceCompatibility JavaVersion.VERSION_1_8

dev/benchmarks/microbenchmarks/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2020

2121
android {
2222
namespace "com.yourcompany.microbenchmarks"
23-
compileSdk flutter.compileSdkVersion
23+
compileSdkVersion flutter.compileSdkVersion
2424

2525
compileOptions {
2626
sourceCompatibility JavaVersion.VERSION_1_8

dev/benchmarks/multiple_flutters/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
}
1515

1616
namespace "dev.flutter.multipleflutters"
17-
compileSdk 34
17+
compileSdkVersion 33
1818

1919
compileOptions {
2020
sourceCompatibility JavaVersion.VERSION_1_8

dev/benchmarks/platform_views_layout/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2020

2121
android {
2222
namespace "dev.benchmarks.platform_views_layout"
23-
compileSdk flutter.compileSdkVersion
23+
compileSdkVersion flutter.compileSdkVersion
2424

2525
compileOptions {
2626
sourceCompatibility JavaVersion.VERSION_1_8

dev/benchmarks/platform_views_layout_hybrid_composition/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2020

2121
android {
2222
namespace "dev.benchmarks.platform_views_layout_hybrid_composition"
23-
compileSdk flutter.compileSdkVersion
23+
compileSdkVersion flutter.compileSdkVersion
2424

2525
compileOptions {
2626
sourceCompatibility JavaVersion.VERSION_1_8

dev/benchmarks/test_apps/stocks/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3030

3131
android {
3232
namespace "io.flutter.examples.stocks"
33-
compileSdk flutter.compileSdkVersion
33+
compileSdkVersion flutter.compileSdkVersion
3434

3535
compileOptions {
3636
sourceCompatibility JavaVersion.VERSION_1_8

dev/integration_tests/abstract_method_smoke_test/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ apply plugin: 'kotlin-android'
3030
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3131

3232
android {
33-
compileSdk flutter.compileSdkVersion
33+
compileSdkVersion flutter.compileSdkVersion
3434

3535
compileOptions {
3636
sourceCompatibility JavaVersion.VERSION_1_8

dev/integration_tests/android_custom_host_app/SampleApp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
apply plugin: 'com.android.application'
66

77
android {
8-
compileSdk 34
8+
compileSdkVersion 33
99

1010
compileOptions {
1111
sourceCompatibility JavaVersion.VERSION_1_8

0 commit comments

Comments
 (0)