Skip to content

F
Front-End
Unverified Commit 0a96f96c authored by Mikkel Nygaard Ravn's avatar Mikkel Nygaard Ravn Committed by GitHub
Browse files
Options

Update and simplify Android templates (#13970)

parent 86c6ce99
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 67 deletions
dev/benchmarks/complex_layout/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -24,7 +23,7 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
dev/benchmarks/microbenchmarks/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -24,7 +23,7 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
dev/integration_tests/channels/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -24,7 +23,7 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
dev/integration_tests/external_ui/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -25,7 +24,7 @@ android {
defaultConfig {
applicationId "io.flutter.externalui"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
dev/integration_tests/flavors/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -25,7 +24,7 @@ android {
defaultConfig {
applicationId "com.yourcompany.flavors"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
dev/integration_tests/platform_interaction/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -24,7 +23,7 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
dev/integration_tests/ui/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -24,7 +23,7 @@ android {
defaultConfig {
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
dev/manual_tests/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -26,7 +25,7 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
applicationId "io.flutter.examples.manual_tests"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "1.0"
}
......
examples/catalog/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -25,7 +24,7 @@ android {
defaultConfig {
applicationId "io.flutter.examples.catalog"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
examples/flutter_gallery/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -25,7 +24,7 @@ android {
defaultConfig {
applicationId "io.flutter.examples.gallery"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
examples/flutter_view/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -25,7 +24,7 @@ android {
defaultConfig {
applicationId "io.flutter.examples.flutter_view"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
examples/hello_world/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -25,7 +24,7 @@ android {
defaultConfig {
applicationId "io.flutter.examples.hello_world"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
examples/layers/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -25,7 +24,7 @@ android {
defaultConfig {
applicationId "io.flutter.examples.layers"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
examples/platform_channel/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -25,7 +24,7 @@ android {
defaultConfig {
applicationId "io.flutter.examples.platform_channel"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
examples/platform_view/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -25,7 +24,7 @@ android {
defaultConfig {
applicationId "io.flutter.examples.platform_view"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
examples/stocks/android/app/build.gradle
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -25,7 +24,7 @@ android {
defaultConfig {
applicationId "io.flutter.examples.stocks"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
packages/flutter_tools/lib/src/commands/create.dart
View file @ 0a96f96c
......@@ -212,9 +212,6 @@ class CreateCommand extends FlutterCommand {
generatedCount += _renderTemplate('create', appPath, templateContext);
generatedCount += _injectGradleWrapper(appPath);
if (appPath != dirPath) {
generatedCount += _injectGradleWrapper(dirPath);
}
if (argResults['with-driver-test']) {
final String testPath = fs.path.join(appPath, 'test_driver');
generatedCount += _renderTemplate('driver', testPath, templateContext);
......
packages/flutter_tools/templates/create/android-java.tmpl/app/build.gradle.tmpl
View file @ 0a96f96c
......@@ -15,8 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
lintOptions {
disable 'InvalidPackage'
......@@ -26,7 +25,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "{{androidIdentifier}}"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
packages/flutter_tools/templates/create/android-kotlin.tmpl/app/build.gradle.tmpl
View file @ 0a96f96c
......@@ -16,8 +16,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
......@@ -31,7 +30,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "{{androidIdentifier}}"
minSdkVersion 16
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......
packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl
View file @ 0a96f96c
......@@ -22,14 +22,10 @@ rootProject.allprojects {
apply plugin: 'com.android.library'
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
defaultConfig {
minSdkVersion 16
targetSdkVersion 26
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
lintOptions {
......
packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
View file @ 0a96f96c
......@@ -25,17 +25,13 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 27
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
defaultConfig {
minSdkVersion 16
targetSdkVersion 26
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
lintOptions {
......
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

HIAST - GitLab