From c669c62ecf138bb4038928a72550bc6ae2c6d79a Mon Sep 17 00:00:00 2001 From: Mikkel Nygaard Ravn Date: Sat, 6 Jan 2018 12:02:33 +0100 Subject: [PATCH] Update Android template instances - retake 2 (#13928) --- .../complex_layout/android/app/build.gradle | 12 ++++++------ .../complex_layout/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../microbenchmarks/android/app/build.gradle | 12 ++++++------ .../microbenchmarks/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../channels/android/app/build.gradle | 12 ++++++------ .../channels/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../external_ui/android/app/build.gradle | 12 ++++++------ .../external_ui/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../flavors/android/app/build.gradle | 16 +++++++++------- .../flavors/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/app/build.gradle | 12 ++++++------ .../platform_interaction/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ui/android/app/build.gradle | 12 ++++++------ dev/integration_tests/ui/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- dev/manual_tests/android/app/build.gradle | 12 ++++++------ dev/manual_tests/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/catalog/android/app/build.gradle | 12 ++++++------ examples/catalog/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../flutter_gallery/android/app/build.gradle | 14 ++++++-------- examples/flutter_gallery/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/flutter_view/android/app/build.gradle | 16 ++++++++-------- .../main/java/com/example/view/MainActivity.java | 16 ++++++++++------ examples/flutter_view/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/hello_world/android/app/build.gradle | 12 ++++++------ examples/hello_world/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/layers/android/app/build.gradle | 12 ++++++------ examples/layers/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../platform_channel/android/app/build.gradle | 12 ++++++------ .../platformchannel/ExampleInstrumentedTest.java | 3 +-- .../example/platformchannel/MainActivity.java | 7 ++----- examples/platform_channel/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/platform_view/android/app/build.gradle | 16 ++++++++-------- .../examples/platform_view/CountActivity.java | 8 ++++---- .../examples/platform_view/MainActivity.java | 4 ++-- examples/platform_view/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/stocks/android/app/build.gradle | 12 ++++++------ examples/stocks/android/build.gradle | 12 +++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 53 files changed, 218 insertions(+), 250 deletions(-) diff --git a/dev/benchmarks/complex_layout/android/app/build.gradle b/dev/benchmarks/complex_layout/android/app/build.gradle index 95066168290..c163c0da210 100644 --- a/dev/benchmarks/complex_layout/android/app/build.gradle +++ b/dev/benchmarks/complex_layout/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -24,7 +24,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -52,7 +52,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/dev/benchmarks/complex_layout/android/build.gradle b/dev/benchmarks/complex_layout/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/dev/benchmarks/complex_layout/android/build.gradle +++ b/dev/benchmarks/complex_layout/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties b/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/dev/benchmarks/microbenchmarks/android/app/build.gradle b/dev/benchmarks/microbenchmarks/android/app/build.gradle index 16c4a2a4ca4..78f8d669303 100644 --- a/dev/benchmarks/microbenchmarks/android/app/build.gradle +++ b/dev/benchmarks/microbenchmarks/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -24,7 +24,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -44,7 +44,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/dev/benchmarks/microbenchmarks/android/build.gradle b/dev/benchmarks/microbenchmarks/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/dev/benchmarks/microbenchmarks/android/build.gradle +++ b/dev/benchmarks/microbenchmarks/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties b/dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/dev/integration_tests/channels/android/app/build.gradle b/dev/integration_tests/channels/android/app/build.gradle index 40c3dca5d4b..14c7cad2393 100644 --- a/dev/integration_tests/channels/android/app/build.gradle +++ b/dev/integration_tests/channels/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -24,7 +24,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -52,7 +52,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/dev/integration_tests/channels/android/build.gradle b/dev/integration_tests/channels/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/dev/integration_tests/channels/android/build.gradle +++ b/dev/integration_tests/channels/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100755 --- a/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/dev/integration_tests/external_ui/android/app/build.gradle b/dev/integration_tests/external_ui/android/app/build.gradle index 30b9d455060..2dc2137baad 100644 --- a/dev/integration_tests/external_ui/android/app/build.gradle +++ b/dev/integration_tests/external_ui/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "io.flutter.externalui" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -43,7 +43,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/dev/integration_tests/external_ui/android/build.gradle b/dev/integration_tests/external_ui/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/dev/integration_tests/external_ui/android/build.gradle +++ b/dev/integration_tests/external_ui/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/dev/integration_tests/external_ui/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/external_ui/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/dev/integration_tests/external_ui/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/external_ui/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/dev/integration_tests/flavors/android/app/build.gradle b/dev/integration_tests/flavors/android/app/build.gradle index 60a8db8a07e..325634ed592 100644 --- a/dev/integration_tests/flavors/android/app/build.gradle +++ b/dev/integration_tests/flavors/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "com.yourcompany.flavors" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -36,7 +36,7 @@ android { signingConfig signingConfigs.debug } } - + aaptOptions { // TODO(goderbauer): remove when https://github.com/flutter/flutter/issues/8986 is resolved. if(System.getenv("FLUTTER_CI_WIN")) { @@ -45,6 +45,8 @@ android { } } + flavorDimensions "mode" + productFlavors { free {} paid {} @@ -56,7 +58,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/dev/integration_tests/flavors/android/build.gradle b/dev/integration_tests/flavors/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/dev/integration_tests/flavors/android/build.gradle +++ b/dev/integration_tests/flavors/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/dev/integration_tests/platform_interaction/android/app/build.gradle b/dev/integration_tests/platform_interaction/android/app/build.gradle index 40c3dca5d4b..14c7cad2393 100644 --- a/dev/integration_tests/platform_interaction/android/app/build.gradle +++ b/dev/integration_tests/platform_interaction/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -24,7 +24,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -52,7 +52,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/dev/integration_tests/platform_interaction/android/build.gradle b/dev/integration_tests/platform_interaction/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/dev/integration_tests/platform_interaction/android/build.gradle +++ b/dev/integration_tests/platform_interaction/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/dev/integration_tests/platform_interaction/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/platform_interaction/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100755 --- a/dev/integration_tests/platform_interaction/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/platform_interaction/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/dev/integration_tests/ui/android/app/build.gradle b/dev/integration_tests/ui/android/app/build.gradle index 134fe518a07..ba567756ab7 100644 --- a/dev/integration_tests/ui/android/app/build.gradle +++ b/dev/integration_tests/ui/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.2' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -24,7 +24,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -44,7 +44,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/dev/integration_tests/ui/android/build.gradle b/dev/integration_tests/ui/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/dev/integration_tests/ui/android/build.gradle +++ b/dev/integration_tests/ui/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/dev/integration_tests/ui/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/ui/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/dev/integration_tests/ui/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/ui/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/dev/manual_tests/android/app/build.gradle b/dev/manual_tests/android/app/build.gradle index f798249aa1d..db48cc7576c 100644 --- a/dev/manual_tests/android/app/build.gradle +++ b/dev/manual_tests/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -26,7 +26,7 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" applicationId "io.flutter.examples.manual_tests" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" } @@ -45,7 +45,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/dev/manual_tests/android/build.gradle b/dev/manual_tests/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/dev/manual_tests/android/build.gradle +++ b/dev/manual_tests/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/dev/manual_tests/android/gradle/wrapper/gradle-wrapper.properties b/dev/manual_tests/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100755 --- a/dev/manual_tests/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/manual_tests/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/examples/catalog/android/app/build.gradle b/examples/catalog/android/app/build.gradle index 0e547471d39..b6e4e14cc42 100644 --- a/examples/catalog/android/app/build.gradle +++ b/examples/catalog/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "io.flutter.examples.catalog" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -45,7 +45,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/examples/catalog/android/build.gradle b/examples/catalog/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/examples/catalog/android/build.gradle +++ b/examples/catalog/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/examples/catalog/android/gradle/wrapper/gradle-wrapper.properties b/examples/catalog/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/examples/catalog/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/catalog/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/examples/flutter_gallery/android/app/build.gradle b/examples/flutter_gallery/android/app/build.gradle index 2b4d1ee17b2..24aca4a832e 100644 --- a/examples/flutter_gallery/android/app/build.gradle +++ b/examples/flutter_gallery/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "io.flutter.examples.gallery" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -53,9 +53,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' - androidTestCompile 'org.hamcrest:hamcrest-library:1.3' - androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/examples/flutter_gallery/android/build.gradle b/examples/flutter_gallery/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/examples/flutter_gallery/android/build.gradle +++ b/examples/flutter_gallery/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/examples/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties b/examples/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/examples/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/examples/flutter_view/android/app/build.gradle b/examples/flutter_view/android/app/build.gradle index e3d4c7a0523..f04b73a209b 100644 --- a/examples/flutter_view/android/app/build.gradle +++ b/examples/flutter_view/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "io.flutter.examples.flutter_view" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -45,9 +45,9 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' - compile 'com.android.support:appcompat-v7:25.0.0' - compile 'com.android.support:design:25.0.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:design:26.1.0' } diff --git a/examples/flutter_view/android/app/src/main/java/com/example/view/MainActivity.java b/examples/flutter_view/android/app/src/main/java/com/example/view/MainActivity.java index 17c2a5eb54e..aaa16992bd7 100644 --- a/examples/flutter_view/android/app/src/main/java/com/example/view/MainActivity.java +++ b/examples/flutter_view/android/app/src/main/java/com/example/view/MainActivity.java @@ -3,6 +3,7 @@ package com.example.view; import android.content.Intent; import android.os.Bundle; import android.support.design.widget.FloatingActionButton; +import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.TextView; @@ -20,13 +21,13 @@ public class MainActivity extends AppCompatActivity { private static final String CHANNEL = "increment"; private static final String EMPTY_MESSAGE = ""; private static final String PING = "ping"; - private BasicMessageChannel messageChannel; + private BasicMessageChannel messageChannel; private String[] getArgsFromIntent(Intent intent) { // Before adding more entries to this list, consider that arbitrary // Android applications can generate intents with extra data and that // there are many security-sensitive args in the binary. - ArrayList args = new ArrayList(); + ArrayList args = new ArrayList<>(); if (intent.getBooleanExtra("trace-startup", false)) { args.add("--trace-startup"); } @@ -52,9 +53,12 @@ public class MainActivity extends AppCompatActivity { String[] args = getArgsFromIntent(getIntent()); FlutterMain.ensureInitializationComplete(getApplicationContext(), args); setContentView(R.layout.flutter_view_layout); - getSupportActionBar().hide(); + ActionBar supportActionBar = getSupportActionBar(); + if (supportActionBar != null) { + supportActionBar.hide(); + } - flutterView = (FlutterView) findViewById(R.id.flutter_view); + flutterView = findViewById(R.id.flutter_view); flutterView.runFromBundle(FlutterMain.findAppBundlePath(getApplicationContext()), null); messageChannel = new BasicMessageChannel<>(flutterView, CHANNEL, StringCodec.INSTANCE); @@ -67,7 +71,7 @@ public class MainActivity extends AppCompatActivity { } }); - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.button); + FloatingActionButton fab = findViewById(R.id.button); fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -82,7 +86,7 @@ public class MainActivity extends AppCompatActivity { private void onFlutterIncrement() { counter++; - TextView textView = (TextView) findViewById(R.id.button_tap); + TextView textView = findViewById(R.id.button_tap); String value = "Flutter button tapped " + counter + (counter == 1 ? " time" : " times"); textView.setText(value); } diff --git a/examples/flutter_view/android/build.gradle b/examples/flutter_view/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/examples/flutter_view/android/build.gradle +++ b/examples/flutter_view/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/examples/flutter_view/android/gradle/wrapper/gradle-wrapper.properties b/examples/flutter_view/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/examples/flutter_view/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/flutter_view/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/examples/hello_world/android/app/build.gradle b/examples/hello_world/android/app/build.gradle index 7b3edc8d94e..69cc6672ad8 100644 --- a/examples/hello_world/android/app/build.gradle +++ b/examples/hello_world/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "io.flutter.examples.hello_world" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -45,7 +45,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/examples/hello_world/android/build.gradle b/examples/hello_world/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/examples/hello_world/android/build.gradle +++ b/examples/hello_world/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties b/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/examples/layers/android/app/build.gradle b/examples/layers/android/app/build.gradle index 374a20a5f57..5e501fc37a9 100644 --- a/examples/layers/android/app/build.gradle +++ b/examples/layers/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "io.flutter.examples.layers" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -45,7 +45,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/examples/layers/android/build.gradle b/examples/layers/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/examples/layers/android/build.gradle +++ b/examples/layers/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/examples/layers/android/gradle/wrapper/gradle-wrapper.properties b/examples/layers/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/examples/layers/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/layers/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/examples/platform_channel/android/app/build.gradle b/examples/platform_channel/android/app/build.gradle index 409bbfb13cf..1d415919328 100644 --- a/examples/platform_channel/android/app/build.gradle +++ b/examples/platform_channel/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "io.flutter.examples.platform_channel" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -45,7 +45,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/examples/platform_channel/android/app/src/androidTest/java/com/example/platformchannel/ExampleInstrumentedTest.java b/examples/platform_channel/android/app/src/androidTest/java/com/example/platformchannel/ExampleInstrumentedTest.java index 8f7695dbf5c..8c1bf37ee2b 100644 --- a/examples/platform_channel/android/app/src/androidTest/java/com/example/platformchannel/ExampleInstrumentedTest.java +++ b/examples/platform_channel/android/app/src/androidTest/java/com/example/platformchannel/ExampleInstrumentedTest.java @@ -29,8 +29,7 @@ public class ExampleInstrumentedTest { final BitmapPoller poller = new BitmapPoller(5); instr.runOnMainSync(new Runnable() { public void run() { - final FlutterView flutterView = (FlutterView) activityRule.getActivity() - .getFlutterView(); + final FlutterView flutterView = activityRule.getActivity().getFlutterView(); // Call onPostResume to start the engine's renderer even if the activity // is paused in the test environment. diff --git a/examples/platform_channel/android/app/src/main/java/com/example/platformchannel/MainActivity.java b/examples/platform_channel/android/app/src/main/java/com/example/platformchannel/MainActivity.java index dc06146663d..19db0603723 100644 --- a/examples/platform_channel/android/app/src/main/java/com/example/platformchannel/MainActivity.java +++ b/examples/platform_channel/android/app/src/main/java/com/example/platformchannel/MainActivity.java @@ -88,17 +88,14 @@ public class MainActivity extends FlutterActivity { } private int getBatteryLevel() { - int batteryLevel = -1; if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { BatteryManager batteryManager = (BatteryManager) getSystemService(BATTERY_SERVICE); - batteryLevel = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY); + return batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY); } else { Intent intent = new ContextWrapper(getApplicationContext()). registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); - batteryLevel = (intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1) * 100) / + return (intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1) * 100) / intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1); } - - return batteryLevel; } } diff --git a/examples/platform_channel/android/build.gradle b/examples/platform_channel/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/examples/platform_channel/android/build.gradle +++ b/examples/platform_channel/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/examples/platform_channel/android/gradle/wrapper/gradle-wrapper.properties b/examples/platform_channel/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/examples/platform_channel/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/platform_channel/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/examples/platform_view/android/app/build.gradle b/examples/platform_view/android/app/build.gradle index e5f19bf9aa7..582699e51d6 100644 --- a/examples/platform_view/android/app/build.gradle +++ b/examples/platform_view/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "io.flutter.examples.platform_view" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -45,9 +45,9 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' - compile 'com.android.support:appcompat-v7:25.0.0' - compile 'com.android.support:design:25.0.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:design:26.1.0' } diff --git a/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/CountActivity.java b/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/CountActivity.java index 2feca7721d1..3d9859d65be 100644 --- a/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/CountActivity.java +++ b/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/CountActivity.java @@ -22,14 +22,14 @@ public class CountActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.android_full_screen_layout); - Toolbar myToolbar = (Toolbar) findViewById(R.id.my_toolbar); + Toolbar myToolbar = findViewById(R.id.my_toolbar); myToolbar.setTitle("Platform View"); setSupportActionBar(myToolbar); counter = getIntent().getIntExtra(EXTRA_COUNTER, 0); updateText(); - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + FloatingActionButton fab = findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -38,7 +38,7 @@ public class CountActivity extends AppCompatActivity { } }); - Button switchViewButton = (Button) findViewById(R.id.button); + Button switchViewButton = findViewById(R.id.button); switchViewButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -48,7 +48,7 @@ public class CountActivity extends AppCompatActivity { } private void updateText() { - TextView textView = (TextView) findViewById(R.id.button_tap); + TextView textView = findViewById(R.id.button_tap); String value = "Button tapped " + counter + (counter == 1 ? " time" : " times"); textView.setText(value); } diff --git a/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/MainActivity.java b/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/MainActivity.java index a701cc86b7c..faa45fb4bc9 100644 --- a/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/MainActivity.java +++ b/examples/platform_view/android/app/src/main/java/io/flutter/examples/platform_view/MainActivity.java @@ -32,7 +32,7 @@ public class MainActivity extends FlutterActivity { MainActivity.this.result = result; int count = methodCall.arguments(); if (methodCall.method.equals(METHOD_SWITCH_VIEW)) { - onlaunchFullScreen(count); + onLaunchFullScreen(count); } else { result.notImplemented(); } @@ -41,7 +41,7 @@ public class MainActivity extends FlutterActivity { ); } - private void onlaunchFullScreen(int count) { + private void onLaunchFullScreen(int count) { Intent fullScreenIntent = new Intent(this, CountActivity.class); fullScreenIntent.putExtra(CountActivity.EXTRA_COUNTER, count); startActivityForResult(fullScreenIntent, COUNT_REQUEST); diff --git a/examples/platform_view/android/build.gradle b/examples/platform_view/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/examples/platform_view/android/build.gradle +++ b/examples/platform_view/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/examples/platform_view/android/gradle/wrapper/gradle-wrapper.properties b/examples/platform_view/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100644 --- a/examples/platform_view/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/platform_view/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/examples/stocks/android/app/build.gradle b/examples/stocks/android/app/build.gradle index 78f362b4940..8004808a73b 100644 --- a/examples/stocks/android/app/build.gradle +++ b/examples/stocks/android/app/build.gradle @@ -15,8 +15,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.3' lintOptions { disable 'InvalidPackage' @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "io.flutter.examples.stocks" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -45,7 +45,7 @@ flutter { } dependencies { - androidTestCompile 'com.android.support:support-annotations:25.4.0' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' } diff --git a/examples/stocks/android/build.gradle b/examples/stocks/android/build.gradle index 77cbd091409..447688755cf 100644 --- a/examples/stocks/android/build.gradle +++ b/examples/stocks/android/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { + google() jcenter() - maven { - url "https://maven.google.com" - } } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } diff --git a/examples/stocks/android/gradle/wrapper/gradle-wrapper.properties b/examples/stocks/android/gradle/wrapper/gradle-wrapper.properties index 45e7f14e952..aa901e1e0db 100755 --- a/examples/stocks/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/stocks/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip