Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "move compile/target sdk versions to 29" #62884

Merged
merged 1 commit into from Aug 4, 2020
Merged

Revert "move compile/target sdk versions to 29" #62884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/benchmarks/complex_layout/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -19,15 +19,15 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
}

defaultConfig {
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "0.0.1"
}
Expand Down
4 changes: 2 additions & 2 deletions dev/benchmarks/macrobenchmarks/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
Expand All @@ -38,7 +38,7 @@ android {
defaultConfig {
applicationId "com.example.macrobenchmarks"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
4 changes: 2 additions & 2 deletions dev/benchmarks/microbenchmarks/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -19,15 +19,15 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
}

defaultConfig {
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "0.0.1"
}
Expand Down
4 changes: 2 additions & 2 deletions dev/benchmarks/platform_views_layout/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -19,15 +19,15 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
}

defaultConfig {
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "0.0.1"
}
Expand Down
4 changes: 2 additions & 2 deletions dev/benchmarks/platform_views_layout_hybrid_composition/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -19,15 +19,15 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
}

defaultConfig {
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "0.0.1"
}
Expand Down
4 changes: 2 additions & 2 deletions dev/benchmarks/test_apps/stocks/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
Expand All @@ -38,7 +38,7 @@ android {
defaultConfig {
applicationId "io.flutter.examples.stocks"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/android_custom_host_app/SampleApp/build.gradle
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 29
compileSdkVersion 28

compileOptions {
sourceCompatibility 1.8
Expand All @@ -15,7 +15,7 @@ android {
defaultConfig {
applicationId "io.flutter.add2app"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/android_embedding_v2_smoke_test/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -44,7 +44,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.android_embedding_v2_smoke_test"
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/android_host_app_v2_embedding/app/build.gradle
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 29
compileSdkVersion 28

compileOptions {
sourceCompatibility 1.8
Expand All @@ -15,7 +15,7 @@ android {
defaultConfig {
applicationId "io.flutter.add2app"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/android_semantics_testing/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -19,15 +19,15 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
}

defaultConfig {
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "0.0.1"
}
Expand Down
4 changes: 2 additions & 2 deletions ...egration_tests/android_splash_screens/splash_screen_kitchen_sink/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
Expand All @@ -39,7 +39,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "io.flutter.splash_screen_kitchen_sink"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
4 changes: 2 additions & 2 deletions ...tegration_tests/android_splash_screens/splash_screen_load_rotate/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
Expand All @@ -39,7 +39,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "io.flutter.splash_screen_load_rotate"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
4 changes: 2 additions & 2 deletions ...egration_tests/android_splash_screens/splash_screen_trans_rotate/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
Expand All @@ -39,7 +39,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "io.flutter.splash_screen_trans_rotate"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/android_views/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
Expand All @@ -39,7 +39,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "io.flutter.integration.platformviews"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/channels/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -19,15 +19,15 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
}

defaultConfig {
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "0.0.1"
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/external_ui/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
Expand All @@ -28,7 +28,7 @@ android {
defaultConfig {
applicationId "io.flutter.externalui"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/flavors/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
Expand All @@ -28,7 +28,7 @@ android {
defaultConfig {
applicationId "com.yourcompany.flavors"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/flutter_driver_screenshot_test/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -44,7 +44,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.screenshot_tests"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/flutter_gallery/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
Expand All @@ -49,7 +49,7 @@ android {
defaultConfig {
applicationId "io.flutter.demo.gallery"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/gradle_deprecated_settings/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
Expand All @@ -28,7 +28,7 @@ android {
defaultConfig {
applicationId "com.yourcompany.flavors"
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/hybrid_android_views/android/app/build.gradle
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
Expand All @@ -39,7 +39,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "io.flutter.integration.platformviews"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/image_loading/android/app/bin/build.gradle
View file
Open in desktop
Expand Up @@ -19,15 +19,15 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 28

lintOptions {
disable 'InvalidPackage'
}

defaultConfig {
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 28
versionCode 1
versionName "0.0.1"
}
Expand Down