Skip to content

F
Front-End
Unverified Commit 8a1bf5b8 authored by Emmanuel Garcia's avatar Emmanuel Garcia Committed by GitHub
Browse files
Options

Reland #39157 (#39798)

parent df4bf453
Hide whitespace changes
Inline Side-by-side
Showing with 673 additions and 334 deletions
dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart
View file @ 8a1bf5b8
...@@ -52,7 +52,6 @@ Future<void> main() async { ...@@ -52,7 +52,6 @@ Future<void> main() async {
'assets/flutter_assets/isolate_snapshot_data', 'assets/flutter_assets/isolate_snapshot_data',
'assets/flutter_assets/kernel_blob.bin', 'assets/flutter_assets/kernel_blob.bin',
'assets/flutter_assets/vm_snapshot_data', 'assets/flutter_assets/vm_snapshot_data',
'lib/armeabi-v7a/libflutter.so',
// Debug mode intentionally includes `x86` and `x86_64`. // Debug mode intentionally includes `x86` and `x86_64`.
'lib/x86/libflutter.so', 'lib/x86/libflutter.so',
'lib/x86_64/libflutter.so', 'lib/x86_64/libflutter.so',
...@@ -79,7 +78,6 @@ Future<void> main() async { ...@@ -79,7 +78,6 @@ Future<void> main() async {
'assets/flutter_assets/isolate_snapshot_data', 'assets/flutter_assets/isolate_snapshot_data',
'assets/flutter_assets/kernel_blob.bin', 'assets/flutter_assets/kernel_blob.bin',
'assets/flutter_assets/vm_snapshot_data', 'assets/flutter_assets/vm_snapshot_data',
'lib/armeabi-v7a/libflutter.so',
// Debug mode intentionally includes `x86` and `x86_64`. // Debug mode intentionally includes `x86` and `x86_64`.
'lib/x86/libflutter.so', 'lib/x86/libflutter.so',
'lib/x86_64/libflutter.so', 'lib/x86_64/libflutter.so',
......
examples/platform_view/android/app/build.gradle
View file @ 8a1bf5b8
...@@ -57,6 +57,6 @@ dependencies { ...@@ -57,6 +57,6 @@ dependencies {
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.android.support:appcompat-v7:26.1.0' implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:design:26.1.0' implementation 'com.android.support:design:28.0.0'
} }
packages/flutter_tools/gradle/flutter.gradle
View file @ 8a1bf5b8
...@@ -42,6 +42,8 @@ android { ...@@ -42,6 +42,8 @@ android {
apply plugin: FlutterPlugin apply plugin: FlutterPlugin
class FlutterPlugin implements Plugin<Project> { class FlutterPlugin implements Plugin<Project> {
private static final String MAVEN_REPO = "http://download.flutter.io";
// The platforms that can be passed to the `--Ptarget-platform` flag. // The platforms that can be passed to the `--Ptarget-platform` flag.
private static final String PLATFORM_ARM32 = "android-arm"; private static final String PLATFORM_ARM32 = "android-arm";
private static final String PLATFORM_ARM64 = "android-arm64"; private static final String PLATFORM_ARM64 = "android-arm64";
...@@ -85,6 +87,7 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -85,6 +87,7 @@ class FlutterPlugin implements Plugin<Project> {
// to match. // to match.
static final String FLUTTER_BUILD_PREFIX = "flutterBuild" static final String FLUTTER_BUILD_PREFIX = "flutterBuild"
private Project project
private Map baseJar = [:] private Map baseJar = [:]
private File flutterRoot private File flutterRoot
private File flutterExecutable private File flutterExecutable
...@@ -92,16 +95,18 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -92,16 +95,18 @@ class FlutterPlugin implements Plugin<Project> {
private String localEngineSrcPath private String localEngineSrcPath
private Properties localProperties private Properties localProperties
private File flutterJar private File flutterJar
private String engineVersion
@Override @Override
void apply(Project project) { void apply(Project project) {
this.project = project
project.extensions.create("flutter", FlutterExtension) project.extensions.create("flutter", FlutterExtension)
project.afterEvaluate this.&addFlutterTasks project.afterEvaluate this.&addFlutterTasks
// By default, assembling APKs generates fat APKs if multiple platforms are passed. // By default, assembling APKs generates fat APKs if multiple platforms are passed.
// Configuring split per ABI allows to generate separate APKs for each abi. // Configuring split per ABI allows to generate separate APKs for each abi.
// This is a noop when building a bundle. // This is a noop when building a bundle.
if (splitPerAbi(project)) { if (shouldSplitPerAbi()) {
project.android { project.android {
splits { splits {
abi { abi {
...@@ -115,14 +120,10 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -115,14 +120,10 @@ class FlutterPlugin implements Plugin<Project> {
} }
} }
} }
getTargetPlatforms(project).each { targetArch -> getTargetPlatforms().each { targetArch ->
String abiValue = PLATFORM_ARCH_MAP[targetArch] String abiValue = PLATFORM_ARCH_MAP[targetArch]
project.android { project.android {
packagingOptions { if (shouldSplitPerAbi()) {
// Prevent the ELF library from getting corrupted.
doNotStrip "*/${abiValue}/libapp.so"
}
if (splitPerAbi(project)) {
splits { splits {
abi { abi {
include abiValue include abiValue
...@@ -132,7 +133,7 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -132,7 +133,7 @@ class FlutterPlugin implements Plugin<Project> {
} }
} }
String flutterRootPath = resolveProperty(project, "flutter.sdk", System.env.FLUTTER_ROOT) String flutterRootPath = resolveProperty("flutter.sdk", System.env.FLUTTER_ROOT)
if (flutterRootPath == null) { if (flutterRootPath == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file or with a FLUTTER_ROOT environment variable.") throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file or with a FLUTTER_ROOT environment variable.")
} }
...@@ -141,6 +142,9 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -141,6 +142,9 @@ class FlutterPlugin implements Plugin<Project> {
throw new GradleException("flutter.sdk must point to the Flutter SDK directory") throw new GradleException("flutter.sdk must point to the Flutter SDK directory")
} }
engineVersion = Paths.get(flutterRoot.absolutePath, "bin", "internal", "engine.version")
.toFile().text.trim()
String flutterExecutableName = Os.isFamily(Os.FAMILY_WINDOWS) ? "flutter.bat" : "flutter" String flutterExecutableName = Os.isFamily(Os.FAMILY_WINDOWS) ? "flutter.bat" : "flutter"
flutterExecutable = Paths.get(flutterRoot.absolutePath, "bin", flutterExecutableName).toFile(); flutterExecutable = Paths.get(flutterRoot.absolutePath, "bin", flutterExecutableName).toFile();
...@@ -173,7 +177,7 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -173,7 +177,7 @@ class FlutterPlugin implements Plugin<Project> {
} }
} }
if (useLocalEngine(project)) { if (useLocalEngine()) {
String engineOutPath = project.property('localEngineOut') String engineOutPath = project.property('localEngineOut')
File engineOut = project.file(engineOutPath) File engineOut = project.file(engineOutPath)
if (!engineOut.isDirectory()) { if (!engineOut.isDirectory()) {
...@@ -194,45 +198,48 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -194,45 +198,48 @@ class FlutterPlugin implements Plugin<Project> {
}) })
} }
} else { } else {
String basePlatformArch = getBasePlatform(project) project.android.buildTypes.each this.&addFlutterDependencies
// This is meant to include the compiled classes only, however it will include `libflutter.so` as well. project.android.buildTypes.whenObjectAdded this.&addFlutterDependencies
Path baseEnginePath = Paths.get(flutterRoot.absolutePath, "bin", "cache", "artifacts", "engine") }
File debugJar = baseEnginePath.resolve("${basePlatformArch}").resolve("flutter.jar").toFile() }
baseJar["debug"] = debugJar
if (!debugJar.isFile()) { /**
project.exec { * Adds the dependencies required by the Flutter project.
executable flutterExecutable.absolutePath * This includes:
args "--suppress-analytics" * 1. The embedding
args "precache" * 2. libflutter.so
} */
if (!debugJar.isFile()) { void addFlutterDependencies(buildType) {
throw new GradleException("Unable to find flutter.jar in SDK: ${debugJar}") project.rootProject.allprojects {
repositories {
maven {
url MAVEN_REPO
} }
} }
baseJar["profile"] = baseEnginePath.resolve("${basePlatformArch}-profile").resolve("flutter.jar").toFile() }
baseJar["release"] = baseEnginePath.resolve("${basePlatformArch}-release").resolve("flutter.jar").toFile() String flutterBuildMode = buildModeFor(buildType)
// Add the embedding dependency.
addApiDependencies(project, buildType.name,
"io.flutter:flutter_embedding_$flutterBuildMode:1.0.0-$engineVersion")
// Add flutter.jar dependencies to all <buildType>Api configurations, including custom ones List<String> platforms = getTargetPlatforms().collect()
// added after applying the Flutter plugin. // Debug mode includes x86 and x64, which are commonly used in emulators.
project.android.buildTypes.each { if (flutterBuildMode == "debug") {
def buildMode = buildModeFor(it) platforms.add("android-x86")
addApiDependencies(project, it.name, project.files { platforms.add("android-x64")
baseJar[buildMode] }
}) platforms.each { platform ->
} String arch = PLATFORM_ARCH_MAP[platform].replace("-", "_")
project.android.buildTypes.whenObjectAdded { // Add the `libflutter.so` dependency.
def buildMode = buildModeFor(it) addApiDependencies(project, buildType.name,
addApiDependencies(project, it.name, project.files { "io.flutter:${arch}_$flutterBuildMode:1.0.0-$engineVersion")
baseJar[buildMode]
})
}
} }
} }
/** /**
* Returns the directory where the plugins are built. * Returns the directory where the plugins are built.
*/ */
private File getPluginBuildDir(Project project) { private File getPluginBuildDir() {
// Module projects specify this flag to include plugins in the same repo as the module project. // Module projects specify this flag to include plugins in the same repo as the module project.
if (project.ext.has("pluginBuildDir")) { if (project.ext.has("pluginBuildDir")) {
return project.ext.get("pluginBuildDir") return project.ext.get("pluginBuildDir")
...@@ -240,13 +247,93 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -240,13 +247,93 @@ class FlutterPlugin implements Plugin<Project> {
return project.buildDir return project.buildDir
} }
private Properties getPluginList(Project project) { /**
* Configures the Flutter plugin dependencies.
*
* The plugins are added to pubspec.yaml. Then, upon running `flutter pub get`,
* the tool generates a `.flutter-plugins` file, which contains a 1:1 map to each plugin location.
* Finally, the project's `settings.gradle` loads each plugin's android directory as a subproject.
*/
private void configurePlugins() {
if (!buildPluginAsAar()) {
getPluginList().each this.&configurePlugin
return
}
addPluginTasks()
List<String> tasksToExecute = project.gradle.startParameter.taskNames
Set buildTypes = getBuildTypesForTasks(tasksToExecute)
if (tasksToExecute.contains("clean")) {
// Because the plugins are built during configuration, the task "clean"
// cannot run in conjunction with an assembly task.
if (!buildTypes.empty) {
throw new GradleException("Can't run the clean task along with other assemble tasks")
}
}
// Build plugins when a task "assembly*" will be called later.
if (!buildTypes.empty) {
// Build the plugin during configuration.
// This is required when Jetifier is enabled, otherwise the implementation dependency
// cannot be added.
buildAarPlugins(buildTypes)
}
}
private void configurePlugin(String name, String _) {
Project pluginProject = project.rootProject.findProject(":$name")
if (pluginProject == null) {
project.logger.error("Plugin project :$name not found. Please update settings.gradle.")
return
}
// Add plugin dependency to the app project.
project.dependencies {
if (project.getConfigurations().findByName("implementation")) {
implementation pluginProject
} else {
compile pluginProject
}
}
Closure addEmbeddingCompileOnlyDependency = { buildType ->
String flutterBuildMode = buildModeFor(buildType)
// Add the embedding as a compile only dependency to the plugin.
if (flutterJar) {
addCompileOnlyDependency(
pluginProject,
buildType.name,
project.files {
flutterJar
}
)
return
}
addCompileOnlyDependency(
pluginProject,
buildType.name,
"io.flutter:flutter_embedding_$flutterBuildMode:1.0.0-$engineVersion",
{
// We only need to expose io.flutter.plugin.*
// No need for the embedding transitive dependencies.
transitive = false
}
)
}
pluginProject.afterEvaluate {
pluginProject.android.buildTypes {
profile {
initWith debug
}
}
pluginProject.android.buildTypes.each addEmbeddingCompileOnlyDependency
pluginProject.android.buildTypes.whenObjectAdded addEmbeddingCompileOnlyDependency
}
}
private Properties getPluginList() {
File pluginsFile = new File(project.projectDir.parentFile.parentFile, '.flutter-plugins') File pluginsFile = new File(project.projectDir.parentFile.parentFile, '.flutter-plugins')
return readPropertiesIfExist(pluginsFile) return readPropertiesIfExist(pluginsFile)
} }
private void addPluginTasks(Project project) { private void addPluginTasks() {
Properties plugins = getPluginList(project) Properties plugins = getPluginList()
project.android.buildTypes.each { buildType -> project.android.buildTypes.each { buildType ->
plugins.each { name, path -> plugins.each { name, path ->
String buildModeValue = buildType.debuggable ? "debug" : "release" String buildModeValue = buildType.debuggable ? "debug" : "release"
...@@ -259,17 +346,17 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -259,17 +346,17 @@ class FlutterPlugin implements Plugin<Project> {
project.tasks.create(name: taskName, type: FlutterPluginTask) { project.tasks.create(name: taskName, type: FlutterPluginTask) {
flutterExecutable this.flutterExecutable flutterExecutable this.flutterExecutable
buildMode buildModeValue buildMode buildModeValue
verbose isVerbose(project) verbose isVerbose()
pluginDir project.file(path) pluginDir project.file(path)
sourceDir project.file(project.flutter.source) sourceDir project.file(project.flutter.source)
intermediateDir getPluginBuildDir(project) intermediateDir getPluginBuildDir()
} }
} }
} }
} }
} }
private void buildPlugins(Project project, Set buildTypes) { private void buildAarPlugins(Set buildTypes) {
List<Project> projects = [project] List<Project> projects = [project]
// Module projects set the `hostProjects` extra property in `include_flutter.groovy`. // Module projects set the `hostProjects` extra property in `include_flutter.groovy`.
// This is required to set the local repository in each host app project. // This is required to set the local repository in each host app project.
...@@ -279,7 +366,7 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -279,7 +366,7 @@ class FlutterPlugin implements Plugin<Project> {
projects.each { hostProject -> projects.each { hostProject ->
hostProject.repositories { hostProject.repositories {
maven { maven {
url "${getPluginBuildDir(project)}/outputs/repo" url "${getPluginBuildDir()}/outputs/repo"
} }
} }
} }
...@@ -314,7 +401,7 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -314,7 +401,7 @@ class FlutterPlugin implements Plugin<Project> {
* Returns a set with the build type names that apply to the given list of tasks * Returns a set with the build type names that apply to the given list of tasks
* required to configure the plugin dependencies. * required to configure the plugin dependencies.
*/ */
private Set getBuildTypesForTasks(Project project, List<String> tasksToExecute) { private Set getBuildTypesForTasks(List<String> tasksToExecute) {
Set buildTypes = [] Set buildTypes = []
tasksToExecute.each { task -> tasksToExecute.each { task ->
project.android.buildTypes.each { buildType -> project.android.buildTypes.each { buildType ->
...@@ -339,7 +426,7 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -339,7 +426,7 @@ class FlutterPlugin implements Plugin<Project> {
return "${parts[0]}${parts[1..-1].collect { it.capitalize() }.join('')}" return "${parts[0]}${parts[1..-1].collect { it.capitalize() }.join('')}"
} }
private String resolveProperty(Project project, String name, String defaultValue) { private String resolveProperty(String name, String defaultValue) {
if (localProperties == null) { if (localProperties == null) {
localProperties = readPropertiesIfExist(new File(project.projectDir.parentFile, "local.properties")) localProperties = readPropertiesIfExist(new File(project.projectDir.parentFile, "local.properties"))
} }
...@@ -364,7 +451,7 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -364,7 +451,7 @@ class FlutterPlugin implements Plugin<Project> {
return result return result
} }
private static List<String> getTargetPlatforms(Project project) { private List<String> getTargetPlatforms() {
if (!project.hasProperty('target-platform')) { if (!project.hasProperty('target-platform')) {
return DEFAULT_PLATFORMS return DEFAULT_PLATFORMS
} }
...@@ -376,18 +463,18 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -376,18 +463,18 @@ class FlutterPlugin implements Plugin<Project> {
} }
} }
private static Boolean splitPerAbi(Project project) { private Boolean shouldSplitPerAbi() {
if (project.hasProperty('split-per-abi')) { if (project.hasProperty('split-per-abi')) {
return project.property('split-per-abi').toBoolean() return project.property('split-per-abi').toBoolean()
} }
return false; return false;
} }
private static Boolean useLocalEngine(Project project) { private Boolean useLocalEngine() {
return project.hasProperty('localEngineOut') return project.hasProperty('localEngineOut')
} }
private static Boolean isVerbose(Project project) { private Boolean isVerbose() {
if (project.hasProperty('verbose')) { if (project.hasProperty('verbose')) {
return project.property('verbose').toBoolean() return project.property('verbose').toBoolean()
} }
...@@ -411,20 +498,7 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -411,20 +498,7 @@ class FlutterPlugin implements Plugin<Project> {
return System.getProperty('build-plugins-as-aars') == 'true' return System.getProperty('build-plugins-as-aars') == 'true'
} }
/** private void addCompileOnlyDependency(Project project, String variantName, Object dependency, Closure config = null) {
* Returns the platform that is used to extract the `libflutter.so` and the .class files.
*
* Note: This is only needed to add the .class files.
* Unfortunately, the engine artifacts include the .class and libflutter.so files.
*/
private static String getBasePlatform(Project project) {
if (PLATFORM_ARM64 in getTargetPlatforms(project)) {
return PLATFORM_ARM64;
}
return PLATFORM_ARM32;
}
private void addFlutterJarCompileOnlyDependency(Project project, String variantName, FileCollection files) {
if (project.state.failure) { if (project.state.failure) {
return return
} }
...@@ -434,7 +508,7 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -434,7 +508,7 @@ class FlutterPlugin implements Plugin<Project> {
} else { } else {
configuration = "${variantName}Provided"; configuration = "${variantName}Provided";
} }
project.dependencies.add(configuration, files) project.dependencies.add(configuration, dependency, config)
} }
private static void addApiDependencies(Project project, String variantName, Object dependency, Closure config = null) { private static void addApiDependencies(Project project, String variantName, Object dependency, Closure config = null) {
...@@ -487,7 +561,6 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -487,7 +561,6 @@ class FlutterPlugin implements Plugin<Project> {
if (project.hasProperty('target')) { if (project.hasProperty('target')) {
target = project.property('target') target = project.property('target')
} }
String[] fileSystemRootsValue = null String[] fileSystemRootsValue = null
if (project.hasProperty('filesystem-roots')) { if (project.hasProperty('filesystem-roots')) {
fileSystemRootsValue = project.property('filesystem-roots').split('\\|') fileSystemRootsValue = project.property('filesystem-roots').split('\\|')
...@@ -524,10 +597,9 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -524,10 +597,9 @@ class FlutterPlugin implements Plugin<Project> {
if (project.hasProperty('extra-gen-snapshot-options')) { if (project.hasProperty('extra-gen-snapshot-options')) {
extraGenSnapshotOptionsValue = project.property('extra-gen-snapshot-options') extraGenSnapshotOptionsValue = project.property('extra-gen-snapshot-options')
} }
def targetPlatforms = getTargetPlatforms()
def targetPlatforms = getTargetPlatforms(project)
def addFlutterDeps = { variant -> def addFlutterDeps = { variant ->
if (splitPerAbi(project)) { if (shouldSplitPerAbi()) {
variant.outputs.each { output -> variant.outputs.each { output ->
// Assigns the new version code to versionCodeOverride, which changes the version code // Assigns the new version code to versionCodeOverride, which changes the version code
// for only the output APK, not for the variant itself. Skipping this step simply // for only the output APK, not for the variant itself. Skipping this step simply
...@@ -540,31 +612,17 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -540,31 +612,17 @@ class FlutterPlugin implements Plugin<Project> {
} }
} }
} }
String flutterBuildMode = buildModeFor(variant.buildType)
if (flutterBuildMode == 'debug' && project.tasks.findByName("${FLUTTER_BUILD_PREFIX}X86Jar")) {
Task task = project.tasks.findByName("compile${variant.name.capitalize()}JavaWithJavac")
if (task) {
task.dependsOn project.flutterBuildX86Jar
}
task = project.tasks.findByName("compile${variant.name.capitalize()}Kotlin")
if (task) {
task.dependsOn project.flutterBuildX86Jar
}
}
def compileTasks = targetPlatforms.collect { targetArch -> def compileTasks = targetPlatforms.collect { targetArch ->
String abiValue = PLATFORM_ARCH_MAP[targetArch]
String taskName = toCammelCase(["compile", FLUTTER_BUILD_PREFIX, variant.name, targetArch.replace('android-', '')]) String taskName = toCammelCase(["compile", FLUTTER_BUILD_PREFIX, variant.name, targetArch.replace('android-', '')])
FlutterTask compileTask = project.tasks.create(name: taskName, type: FlutterTask) { project.tasks.create(name: taskName, type: FlutterTask) {
flutterRoot this.flutterRoot flutterRoot this.flutterRoot
flutterExecutable this.flutterExecutable flutterExecutable this.flutterExecutable
buildMode flutterBuildMode buildMode buildModeFor(variant.buildType)
localEngine this.localEngine localEngine this.localEngine
localEngineSrcPath this.localEngineSrcPath localEngineSrcPath this.localEngineSrcPath
abi abiValue abi PLATFORM_ARCH_MAP[targetArch]
targetPath target targetPath target
verbose isVerbose(project) verbose isVerbose()
fileSystemRoots fileSystemRootsValue fileSystemRoots fileSystemRootsValue
fileSystemScheme fileSystemSchemeValue fileSystemScheme fileSystemSchemeValue
trackWidgetCreation trackWidgetCreationValue trackWidgetCreation trackWidgetCreationValue
...@@ -579,51 +637,24 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -579,51 +637,24 @@ class FlutterPlugin implements Plugin<Project> {
extraGenSnapshotOptions extraGenSnapshotOptionsValue extraGenSnapshotOptions extraGenSnapshotOptionsValue
} }
} }
def libJar = project.file("${project.buildDir}/${AndroidProject.FD_INTERMEDIATES}/flutter/${variant.name}/libs.jar") def libJar = project.file("${project.buildDir}/${AndroidProject.FD_INTERMEDIATES}/flutter/${variant.name}/libs.jar")
def libFlutterPlatforms = targetPlatforms.collect() Task packFlutterAppAotTask = project.tasks.create(name: "packLibs${FLUTTER_BUILD_PREFIX}${variant.name.capitalize()}", type: Jar) {
// x86/x86_64 native library used for debugging only, for now.
if (flutterBuildMode == 'debug') {
libFlutterPlatforms.add('android-x86')
libFlutterPlatforms.add('android-x64')
}
Task packFlutterSnapshotsAndLibsTask = project.tasks.create(name: "packLibs${FLUTTER_BUILD_PREFIX}${variant.name.capitalize()}", type: Jar) {
destinationDir libJar.parentFile destinationDir libJar.parentFile
archiveName libJar.name archiveName libJar.name
libFlutterPlatforms.each { targetArch ->
// This check prevents including `libflutter.so` twice, since it's included in the base platform jar.
// Unfortunately, the `pickFirst` setting in `packagingOptions` does not work when the project `:flutter`
// is included as an implementation dependency, which causes duplicated `libflutter.so`.
if (getBasePlatform(project) == targetArch) {
return
}
// Don't include `libflutter.so` for other architectures when a local engine is specified.
if (useLocalEngine(project)) {
return
}
def engineArtifactSubdir = getEngineArtifactDirName(variant.buildType, targetArch);
// Include `libflutter.so`.
// TODO(blasten): The libs should be outside `flutter.jar` when the artifacts are downloaded.
from(project.zipTree("${flutterRoot}/bin/cache/artifacts/engine/${engineArtifactSubdir}/flutter.jar")) {
include 'lib/**'
}
}
dependsOn compileTasks dependsOn compileTasks
// Add the ELF library.
compileTasks.each { compileTask -> compileTasks.each { compileTask ->
from(compileTask.intermediateDir) { from(compileTask.intermediateDir) {
include '*.so' include '*.so'
// Move `app.so` to `lib/<abi>/libapp.so`
rename { String filename -> rename { String filename ->
return "lib/${compileTask.abi}/lib${filename}" return "lib/${compileTask.abi}/lib${filename}"
} }
} }
} }
} }
// Include the snapshots and libflutter.so in `lib/`.
addApiDependencies(project, variant.name, project.files { addApiDependencies(project, variant.name, project.files {
packFlutterSnapshotsAndLibsTask packFlutterAppAotTask
}) })
// We know that the flutter app is a subproject in another Android app when these tasks exist. // We know that the flutter app is a subproject in another Android app when these tasks exist.
Task packageAssets = project.tasks.findByPath(":flutter:package${variant.name.capitalize()}Assets") Task packageAssets = project.tasks.findByPath(":flutter:package${variant.name.capitalize()}Assets")
Task cleanPackageAssets = project.tasks.findByPath(":flutter:cleanPackage${variant.name.capitalize()}Assets") Task cleanPackageAssets = project.tasks.findByPath(":flutter:cleanPackage${variant.name.capitalize()}Assets")
...@@ -650,57 +681,7 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -650,57 +681,7 @@ class FlutterPlugin implements Plugin<Project> {
} else { } else {
project.android.libraryVariants.all addFlutterDeps project.android.libraryVariants.all addFlutterDeps
} }
configurePlugins()
if (buildPluginAsAar()) {
addPluginTasks(project)
List<String> tasksToExecute = project.gradle.startParameter.taskNames
Set buildTypes = getBuildTypesForTasks(project, tasksToExecute)
if (tasksToExecute.contains("clean")) {
// Because the plugins are built during configuration, the task "clean"
// cannot run in conjunction with an assembly task.
if (!buildTypes.empty) {
throw new GradleException("Can't run the clean task along with other assemble tasks")
}
}
// Build plugins when a task "assembly*" will be called later.
if (!buildTypes.empty) {
// Build the plugin during configuration.
// This is required when Jetifier is enabled, otherwise the implementation dependency
// cannot be added.
buildPlugins(project, buildTypes)
}
} else {
getPluginList(project).each { name, _ ->
def pluginProject = project.rootProject.findProject(":$name")
if (pluginProject != null) {
project.dependencies {
if (project.getConfigurations().findByName("implementation")) {
implementation pluginProject
} else {
compile pluginProject
}
}
pluginProject.afterEvaluate {
pluginProject.android.buildTypes {
profile {
initWith debug
}
}
pluginProject.android.buildTypes.each {
def buildMode = buildModeFor(it)
addFlutterJarCompileOnlyDependency(pluginProject, it.name, project.files( flutterJar ?: baseJar[buildMode] ))
}
pluginProject.android.buildTypes.whenObjectAdded {
def buildMode = buildModeFor(it)
addFlutterJarCompileOnlyDependency(pluginProject, it.name, project.files( flutterJar ?: baseJar[buildMode] ))
}
}
} else {
project.logger.error("Plugin project :$name not found. Please update settings.gradle.")
}
}
}
} }
} }
......
packages/flutter_tools/gradle/flutter_proguard_rules.pro
View file @ 8a1bf5b8
# Prevents `Fragment and FragmentActivity not found`.
# TODO(blasten): Remove once we bring the Maven dependencies.
-dontwarn io.flutter.embedding.**
# Build the ephemeral app in a module project. # Build the ephemeral app in a module project.
# Prevents: Warning: library class <plugin-package> depends on program class io.flutter.plugin.** # Prevents: Warning: library class <plugin-package> depends on program class io.flutter.plugin.**
# This is due to plugins (libraries) depending on the embedding (the program jar) # This is due to plugins (libraries) depending on the embedding (the program jar)
......
packages/flutter_tools/gradle/resolve_dependencies.gradle 0 → 100644
View file @ 8a1bf5b8
// Copyright 2019 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
//
// This script is used to warm the Gradle cache by downloading the Flutter dependencies
// used during the build. This script is invoked when `flutter precache` is run.
//
// Command:
// gradle -b <flutter-sdk>packages/flutter_tools/gradle/resolve_dependencies.gradle
// resolveDependencies
//
// This way, Gradle can run with the `--offline` flag later on to eliminate any
// network request during the build process.
//
// This includes:
// 1. The embedding
// 2. libflutter.so
import java.nio.file.Paths
repositories {
google()
jcenter()
maven {
url "http://download.flutter.io"
}
}
File flutterRoot = projectDir.parentFile.parentFile.parentFile
assert flutterRoot.isDirectory()
String engineVersion = Paths.get(flutterRoot.absolutePath, "bin", "internal", "engine.version")
.toFile().text.trim()
configurations {
flutterRelease.extendsFrom releaseImplementation
flutterDebug.extendsFrom debugImplementation
flutterProfile.extendsFrom debugImplementation
}
dependencies {
flutterRelease "io.flutter:flutter_embedding_release:1.0.0-$engineVersion"
flutterRelease "io.flutter:armeabi_v7a_release:1.0.0-$engineVersion"
flutterRelease "io.flutter:arm64_v8a_release:1.0.0-$engineVersion"
flutterProfile "io.flutter:flutter_embedding_profile:1.0.0-$engineVersion"
flutterProfile "io.flutter:armeabi_v7a_profile:1.0.0-$engineVersion"
flutterProfile "io.flutter:arm64_v8a_profile:1.0.0-$engineVersion"
flutterDebug "io.flutter:flutter_embedding_debug:1.0.0-$engineVersion"
flutterDebug "io.flutter:armeabi_v7a_debug:1.0.0-$engineVersion"
flutterDebug "io.flutter:arm64_v8a_debug:1.0.0-$engineVersion"
flutterDebug "io.flutter:x86_debug:1.0.0-$engineVersion"
flutterDebug "io.flutter:x86_64_debug:1.0.0-$engineVersion"
}
task resolveDependencies {
configurations.each { configuration ->
if (configuration.name.startsWith("flutter")) {
configuration.resolve()
}
}
}
packages/flutter_tools/lib/executable.dart
View file @ 8a1bf5b8
...@@ -84,7 +84,7 @@ Future<void> main(List<String> args) async { ...@@ -84,7 +84,7 @@ Future<void> main(List<String> args) async {
LogsCommand(), LogsCommand(),
MakeHostAppEditableCommand(), MakeHostAppEditableCommand(),
PackagesCommand(), PackagesCommand(),
PrecacheCommand(), PrecacheCommand(verboseHelp: verboseHelp),
RunCommand(verboseHelp: verboseHelp), RunCommand(verboseHelp: verboseHelp),
ScreenshotCommand(), ScreenshotCommand(),
ShellCompletionCommand(), ShellCompletionCommand(),
......
packages/flutter_tools/lib/src/android/gradle.dart
View file @ 8a1bf5b8
...@@ -149,7 +149,7 @@ Future<void> checkGradleDependencies() async { ...@@ -149,7 +149,7 @@ Future<void> checkGradleDependencies() async {
<String>[gradlew, 'dependencies'], <String>[gradlew, 'dependencies'],
throwOnError: true, throwOnError: true,
workingDirectory: flutterProject.android.hostAppGradleRoot.path, workingDirectory: flutterProject.android.hostAppGradleRoot.path,
environment: _gradleEnv, environment: gradleEnv,
); );
androidSdk.reinitialize(); androidSdk.reinitialize();
progress.stop(); progress.stop();
...@@ -239,13 +239,13 @@ Future<GradleProject> _readGradleProject({bool isLibrary = false}) async { ...@@ -239,13 +239,13 @@ Future<GradleProject> _readGradleProject({bool isLibrary = false}) async {
<String>[gradlew, if (isLibrary) 'properties' else 'app:properties'], <String>[gradlew, if (isLibrary) 'properties' else 'app:properties'],
throwOnError: true, throwOnError: true,
workingDirectory: hostAppGradleRoot.path, workingDirectory: hostAppGradleRoot.path,
environment: _gradleEnv, environment: gradleEnv,
); );
final RunResult tasksRunResult = await processUtils.run( final RunResult tasksRunResult = await processUtils.run(
<String>[gradlew, if (isLibrary) 'tasks' else 'app:tasks', '--all', '--console=auto'], <String>[gradlew, if (isLibrary) 'tasks' else 'app:tasks', '--all', '--console=auto'],
throwOnError: true, throwOnError: true,
workingDirectory: hostAppGradleRoot.path, workingDirectory: hostAppGradleRoot.path,
environment: _gradleEnv, environment: gradleEnv,
); );
project = GradleProject.fromAppProperties(propertiesRunResult.stdout, tasksRunResult.stdout); project = GradleProject.fromAppProperties(propertiesRunResult.stdout, tasksRunResult.stdout);
} catch (exception) { } catch (exception) {
...@@ -324,7 +324,7 @@ Future<String> _initializeGradle(FlutterProject project) async { ...@@ -324,7 +324,7 @@ Future<String> _initializeGradle(FlutterProject project) async {
await processUtils.run( await processUtils.run(
<String>[gradle, '-v'], <String>[gradle, '-v'],
throwOnError: true, throwOnError: true,
environment: _gradleEnv, environment: gradleEnv,
); );
} on ProcessException catch (e) { } on ProcessException catch (e) {
final String error = e.toString(); final String error = e.toString();
...@@ -640,7 +640,7 @@ Future<void> buildGradleAar({ ...@@ -640,7 +640,7 @@ Future<void> buildGradleAar({
command, command,
workingDirectory: project.android.hostAppGradleRoot.path, workingDirectory: project.android.hostAppGradleRoot.path,
allowReentrantFlutter: true, allowReentrantFlutter: true,
environment: _gradleEnv, environment: gradleEnv,
mapFunction: (String line) { mapFunction: (String line) {
// Always print the full line in verbose mode. // Always print the full line in verbose mode.
if (logger.isVerbose) { if (logger.isVerbose) {
...@@ -678,7 +678,7 @@ Future<void> _buildGradleProjectV1(FlutterProject project) async { ...@@ -678,7 +678,7 @@ Future<void> _buildGradleProjectV1(FlutterProject project) async {
<String>[fs.file(gradlew).absolute.path, 'build'], <String>[fs.file(gradlew).absolute.path, 'build'],
workingDirectory: project.android.hostAppGradleRoot.path, workingDirectory: project.android.hostAppGradleRoot.path,
allowReentrantFlutter: true, allowReentrantFlutter: true,
environment: _gradleEnv, environment: gradleEnv,
); );
status.stop(); status.stop();
flutterUsage.sendTiming('build', 'gradle-v1', Duration(milliseconds: sw.elapsedMilliseconds)); flutterUsage.sendTiming('build', 'gradle-v1', Duration(milliseconds: sw.elapsedMilliseconds));
...@@ -809,7 +809,7 @@ Future<void> _buildGradleProjectV2( ...@@ -809,7 +809,7 @@ Future<void> _buildGradleProjectV2(
command, command,
workingDirectory: flutterProject.android.hostAppGradleRoot.path, workingDirectory: flutterProject.android.hostAppGradleRoot.path,
allowReentrantFlutter: true, allowReentrantFlutter: true,
environment: _gradleEnv, environment: gradleEnv,
// TODO(mklim): if AndroidX warnings are no longer required, this // TODO(mklim): if AndroidX warnings are no longer required, this
// mapFunction and all its associated variabled can be replaced with just // mapFunction and all its associated variabled can be replaced with just
// `filter: ndkMessagefilter`. // `filter: ndkMessagefilter`.
...@@ -961,7 +961,8 @@ File findBundleFile(GradleProject project, BuildInfo buildInfo) { ...@@ -961,7 +961,8 @@ File findBundleFile(GradleProject project, BuildInfo buildInfo) {
return null; return null;
} }
Map<String, String> get _gradleEnv { /// The environment variables needed to run Gradle.
Map<String, String> get gradleEnv {
final Map<String, String> env = Map<String, String>.from(platform.environment); final Map<String, String> env = Map<String, String>.from(platform.environment);
if (javaPath != null) { if (javaPath != null) {
// Use java bundled with Android Studio. // Use java bundled with Android Studio.
......
packages/flutter_tools/lib/src/cache.dart
View file @ 8a1bf5b8
...@@ -6,6 +6,7 @@ import 'dart:async'; ...@@ -6,6 +6,7 @@ import 'dart:async';
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
import 'android/gradle.dart';
import 'base/common.dart'; import 'base/common.dart';
import 'base/context.dart'; import 'base/context.dart';
import 'base/file_system.dart'; import 'base/file_system.dart';
...@@ -14,6 +15,7 @@ import 'base/logger.dart'; ...@@ -14,6 +15,7 @@ import 'base/logger.dart';
import 'base/net.dart'; import 'base/net.dart';
import 'base/os.dart'; import 'base/os.dart';
import 'base/platform.dart'; import 'base/platform.dart';
import 'base/process.dart';
import 'globals.dart'; import 'globals.dart';
/// A tag for a set of development artifacts that need to be cached. /// A tag for a set of development artifacts that need to be cached.
...@@ -30,7 +32,10 @@ class DevelopmentArtifact { ...@@ -30,7 +32,10 @@ class DevelopmentArtifact {
final bool unstable; final bool unstable;
/// Artifacts required for Android development. /// Artifacts required for Android development.
static const DevelopmentArtifact android = DevelopmentArtifact._('android'); static const DevelopmentArtifact androidGenSnapshot = DevelopmentArtifact._('android_gen_snapshot');
static const DevelopmentArtifact androidMaven = DevelopmentArtifact._('android_maven');
// Artifacts used for internal builds.
static const DevelopmentArtifact androidInternalBuild = DevelopmentArtifact._('android_internal_build');
/// Artifacts required for iOS development. /// Artifacts required for iOS development.
static const DevelopmentArtifact iOS = DevelopmentArtifact._('ios'); static const DevelopmentArtifact iOS = DevelopmentArtifact._('ios');
...@@ -58,7 +63,9 @@ class DevelopmentArtifact { ...@@ -58,7 +63,9 @@ class DevelopmentArtifact {
/// The values of DevelopmentArtifacts. /// The values of DevelopmentArtifacts.
static final List<DevelopmentArtifact> values = <DevelopmentArtifact>[ static final List<DevelopmentArtifact> values = <DevelopmentArtifact>[
android, androidGenSnapshot,
androidMaven,
androidInternalBuild,
iOS, iOS,
web, web,
macOS, macOS,
...@@ -74,12 +81,16 @@ class DevelopmentArtifact { ...@@ -74,12 +81,16 @@ class DevelopmentArtifact {
class Cache { class Cache {
/// [rootOverride] is configurable for testing. /// [rootOverride] is configurable for testing.
/// [artifacts] is configurable for testing. /// [artifacts] is configurable for testing.
Cache({ Directory rootOverride, List<CachedArtifact> artifacts }) : _rootOverride = rootOverride { Cache({ Directory rootOverride, List<ArtifactSet> artifacts }) : _rootOverride = rootOverride {
if (artifacts == null) { if (artifacts == null) {
_artifacts.add(MaterialFonts(this)); _artifacts.add(MaterialFonts(this));
_artifacts.add(AndroidEngineArtifacts(this));
_artifacts.add(IOSEngineArtifacts(this));
_artifacts.add(GradleWrapper(this)); _artifacts.add(GradleWrapper(this));
_artifacts.add(AndroidMavenArtifacts());
_artifacts.add(AndroidGenSnapshotArtifacts(this));
_artifacts.add(AndroidInternalBuildArtifacts(this));
_artifacts.add(IOSEngineArtifacts(this));
_artifacts.add(FlutterWebSdk(this)); _artifacts.add(FlutterWebSdk(this));
_artifacts.add(FlutterSdk(this)); _artifacts.add(FlutterSdk(this));
_artifacts.add(WindowsEngineArtifacts(this)); _artifacts.add(WindowsEngineArtifacts(this));
...@@ -101,7 +112,7 @@ class Cache { ...@@ -101,7 +112,7 @@ class Cache {
]; ];
final Directory _rootOverride; final Directory _rootOverride;
final List<CachedArtifact> _artifacts = <CachedArtifact>[]; final List<ArtifactSet> _artifacts = <ArtifactSet>[];
// Initialized by FlutterCommandRunner on startup. // Initialized by FlutterCommandRunner on startup.
static String flutterRoot; static String flutterRoot;
...@@ -248,11 +259,16 @@ class Cache { ...@@ -248,11 +259,16 @@ class Cache {
return _dyLdLibEntry; return _dyLdLibEntry;
} }
final List<String> paths = <String>[]; final List<String> paths = <String>[];
for (CachedArtifact artifact in _artifacts) { for (ArtifactSet artifact in _artifacts) {
final String currentPath = artifact.dyLdLibPath; final Map<String, String> env = artifact.environment;
if (currentPath.isNotEmpty) { if (env == null || !env.containsKey('DYLD_LIBRARY_PATH')) {
paths.add(currentPath); continue;
}
final String path = env['DYLD_LIBRARY_PATH'];
if (path.isEmpty) {
continue;
} }
paths.add(path);
} }
_dyLdLibEntry = MapEntry<String, String>('DYLD_LIBRARY_PATH', paths.join(':')); _dyLdLibEntry = MapEntry<String, String>('DYLD_LIBRARY_PATH', paths.join(':'));
return _dyLdLibEntry; return _dyLdLibEntry;
...@@ -292,7 +308,7 @@ class Cache { ...@@ -292,7 +308,7 @@ class Cache {
return isOlderThanReference(entity: entity, referenceFile: flutterToolsStamp); return isOlderThanReference(entity: entity, referenceFile: flutterToolsStamp);
} }
bool isUpToDate() => _artifacts.every((CachedArtifact artifact) => artifact.isUpToDate()); bool isUpToDate() => _artifacts.every((ArtifactSet artifact) => artifact.isUpToDate());
Future<String> getThirdPartyFile(String urlStr, String serviceName) async { Future<String> getThirdPartyFile(String urlStr, String serviceName) async {
final Uri url = Uri.parse(urlStr); final Uri url = Uri.parse(urlStr);
...@@ -321,22 +337,27 @@ class Cache { ...@@ -321,22 +337,27 @@ class Cache {
if (!_lockEnabled) { if (!_lockEnabled) {
return; return;
} }
try { for (ArtifactSet artifact in _artifacts) {
for (CachedArtifact artifact in _artifacts) { if (!requiredArtifacts.contains(artifact.developmentArtifact)) {
if (!artifact.isUpToDate()) { printTrace('Artifact $artifact is not required, skipping update.');
await artifact.update(requiredArtifacts); continue;
}
} }
} on SocketException catch (e) { if (artifact.isUpToDate()) {
if (_hostsBlockedInChina.contains(e.address?.host)) { continue;
printError( }
'Failed to retrieve Flutter tool dependencies: ${e.message}.\n' try {
'If you\'re in China, please see this page: ' await artifact.update();
'https://flutter.dev/community/china', } on SocketException catch (e) {
emphasis: true, if (_hostsBlockedInChina.contains(e.address?.host)) {
); printError(
'Failed to retrieve Flutter tool dependencies: ${e.message}.\n'
'If you\'re in China, please see this page: '
'https://flutter.dev/community/china',
emphasis: true,
);
}
rethrow;
} }
rethrow;
} }
} }
...@@ -357,23 +378,42 @@ class Cache { ...@@ -357,23 +378,42 @@ class Cache {
} }
} }
/// An artifact managed by the cache. /// Representation of a set of artifacts used by the tool.
abstract class CachedArtifact { abstract class ArtifactSet {
CachedArtifact(this.name, this.cache, this.developmentArtifacts); ArtifactSet(this.developmentArtifact) : assert(developmentArtifact != null);
/// The development artifact.
final DevelopmentArtifact developmentArtifact;
/// [true] if the artifact is up to date.
bool isUpToDate();
/// The environment variables (if any) required to consume the artifacts.
Map<String, String> get environment {
return const <String, String>{};
}
/// Updates the artifact.
Future<void> update();
}
/// An artifact set managed by the cache.
abstract class CachedArtifact extends ArtifactSet {
CachedArtifact(
this.name,
this.cache,
DevelopmentArtifact developmentArtifact,
) : super(developmentArtifact);
final String name;
final Cache cache; final Cache cache;
/// The canonical name of the artifact.
final String name;
// The name of the stamp file. Defaults to the same as the // The name of the stamp file. Defaults to the same as the
// artifact name. // artifact name.
String get stampName => name; String get stampName => name;
/// Returns a string to be set as environment DYLD_LIBARY_PATH variable
String get dyLdLibPath => '';
/// All development artifacts this cache provides.
final Set<DevelopmentArtifact> developmentArtifacts;
Directory get location => cache.getArtifactDirectory(name); Directory get location => cache.getArtifactDirectory(name);
String get version => cache.getVersionFor(name); String get version => cache.getVersionFor(name);
...@@ -383,6 +423,7 @@ abstract class CachedArtifact { ...@@ -383,6 +423,7 @@ abstract class CachedArtifact {
/// starting from scratch. /// starting from scratch.
final List<File> _downloadedFiles = <File>[]; final List<File> _downloadedFiles = <File>[];
@override
bool isUpToDate() { bool isUpToDate() {
if (!location.existsSync()) { if (!location.existsSync()) {
return false; return false;
...@@ -393,13 +434,8 @@ abstract class CachedArtifact { ...@@ -393,13 +434,8 @@ abstract class CachedArtifact {
return isUpToDateInner(); return isUpToDateInner();
} }
Future<void> update(Set<DevelopmentArtifact> requiredArtifacts) async { @override
// If the set of required artifacts does not include any from this cache, Future<void> update() async {
// then we can claim we are up to date to skip downloading.
if (!requiredArtifacts.any(developmentArtifacts.contains)) {
printTrace('Artifact $this is not required, skipping update.');
return;
}
if (!location.existsSync()) { if (!location.existsSync()) {
try { try {
location.createSync(recursive: true); location.createSync(recursive: true);
...@@ -504,7 +540,7 @@ class MaterialFonts extends CachedArtifact { ...@@ -504,7 +540,7 @@ class MaterialFonts extends CachedArtifact {
MaterialFonts(Cache cache) : super( MaterialFonts(Cache cache) : super(
'material_fonts', 'material_fonts',
cache, cache,
const <DevelopmentArtifact>{ DevelopmentArtifact.universal }, DevelopmentArtifact.universal,
); );
@override @override
...@@ -522,7 +558,7 @@ class FlutterWebSdk extends CachedArtifact { ...@@ -522,7 +558,7 @@ class FlutterWebSdk extends CachedArtifact {
FlutterWebSdk(Cache cache) : super( FlutterWebSdk(Cache cache) : super(
'flutter_web_sdk', 'flutter_web_sdk',
cache, cache,
const <DevelopmentArtifact>{ DevelopmentArtifact.web }, DevelopmentArtifact.web,
); );
@override @override
...@@ -563,8 +599,8 @@ abstract class EngineCachedArtifact extends CachedArtifact { ...@@ -563,8 +599,8 @@ abstract class EngineCachedArtifact extends CachedArtifact {
EngineCachedArtifact( EngineCachedArtifact(
this.stampName, this.stampName,
Cache cache, Cache cache,
Set<DevelopmentArtifact> requiredArtifacts, DevelopmentArtifact developmentArtifact,
) : super('engine', cache, requiredArtifacts); ) : super('engine', cache, developmentArtifact);
@override @override
final String stampName; final String stampName;
...@@ -685,7 +721,7 @@ class FlutterSdk extends EngineCachedArtifact { ...@@ -685,7 +721,7 @@ class FlutterSdk extends EngineCachedArtifact {
FlutterSdk(Cache cache) : super( FlutterSdk(Cache cache) : super(
'flutter_sdk', 'flutter_sdk',
cache, cache,
const <DevelopmentArtifact>{ DevelopmentArtifact.universal }, DevelopmentArtifact.universal,
); );
@override @override
...@@ -719,7 +755,7 @@ class MacOSEngineArtifacts extends EngineCachedArtifact { ...@@ -719,7 +755,7 @@ class MacOSEngineArtifacts extends EngineCachedArtifact {
MacOSEngineArtifacts(Cache cache) : super( MacOSEngineArtifacts(Cache cache) : super(
'macos-sdk', 'macos-sdk',
cache, cache,
const <DevelopmentArtifact> { DevelopmentArtifact.macOS }, DevelopmentArtifact.macOS,
); );
@override @override
...@@ -741,7 +777,7 @@ class WindowsEngineArtifacts extends EngineCachedArtifact { ...@@ -741,7 +777,7 @@ class WindowsEngineArtifacts extends EngineCachedArtifact {
WindowsEngineArtifacts(Cache cache) : super( WindowsEngineArtifacts(Cache cache) : super(
'windows-sdk', 'windows-sdk',
cache, cache,
const <DevelopmentArtifact> { DevelopmentArtifact.windows }, DevelopmentArtifact.windows,
); );
@override @override
...@@ -763,7 +799,7 @@ class LinuxEngineArtifacts extends EngineCachedArtifact { ...@@ -763,7 +799,7 @@ class LinuxEngineArtifacts extends EngineCachedArtifact {
LinuxEngineArtifacts(Cache cache) : super( LinuxEngineArtifacts(Cache cache) : super(
'linux-sdk', 'linux-sdk',
cache, cache,
const <DevelopmentArtifact> { DevelopmentArtifact.linux }, DevelopmentArtifact.linux,
); );
@override @override
...@@ -781,11 +817,12 @@ class LinuxEngineArtifacts extends EngineCachedArtifact { ...@@ -781,11 +817,12 @@ class LinuxEngineArtifacts extends EngineCachedArtifact {
List<String> getLicenseDirs() => const <String>[]; List<String> getLicenseDirs() => const <String>[];
} }
class AndroidEngineArtifacts extends EngineCachedArtifact { /// The artifact used to generate snapshots for Android builds.
AndroidEngineArtifacts(Cache cache) : super( class AndroidGenSnapshotArtifacts extends EngineCachedArtifact {
AndroidGenSnapshotArtifacts(Cache cache) : super(
'android-sdk', 'android-sdk',
cache, cache,
const <DevelopmentArtifact>{ DevelopmentArtifact.android }, DevelopmentArtifact.androidGenSnapshot,
); );
@override @override
...@@ -799,23 +836,19 @@ class AndroidEngineArtifacts extends EngineCachedArtifact { ...@@ -799,23 +836,19 @@ class AndroidEngineArtifacts extends EngineCachedArtifact {
..._osxBinaryDirs, ..._osxBinaryDirs,
..._linuxBinaryDirs, ..._linuxBinaryDirs,
..._windowsBinaryDirs, ..._windowsBinaryDirs,
..._androidBinaryDirs,
..._dartSdks, ..._dartSdks,
] ]
else if (platform.isWindows) else if (platform.isWindows)
...<List<String>>[ ...<List<String>>[
..._windowsBinaryDirs, ..._windowsBinaryDirs,
..._androidBinaryDirs,
] ]
else if (platform.isMacOS) else if (platform.isMacOS)
...<List<String>>[ ...<List<String>>[
..._osxBinaryDirs, ..._osxBinaryDirs,
..._androidBinaryDirs,
] ]
else if (platform.isLinux) else if (platform.isLinux)
...<List<String>>[ ...<List<String>>[
..._linuxBinaryDirs, ..._linuxBinaryDirs,
..._androidBinaryDirs,
] ]
]; ];
} }
...@@ -824,11 +857,79 @@ class AndroidEngineArtifacts extends EngineCachedArtifact { ...@@ -824,11 +857,79 @@ class AndroidEngineArtifacts extends EngineCachedArtifact {
List<String> getLicenseDirs() { return <String>[]; } List<String> getLicenseDirs() { return <String>[]; }
} }
/// Artifacts used for internal builds. The flutter tool builds Android projects
/// using the artifacts cached by [AndroidMavenArtifacts].
class AndroidInternalBuildArtifacts extends EngineCachedArtifact {
AndroidInternalBuildArtifacts(Cache cache) : super(
'android-internal-build-artifacts',
cache,
DevelopmentArtifact.androidInternalBuild,
);
@override
List<String> getPackageDirs() => const <String>[];
@override
List<List<String>> getBinaryDirs() {
return _androidBinaryDirs;
}
@override
List<String> getLicenseDirs() { return <String>[]; }
}
/// A cached artifact containing the Maven dependencies used to build Android projects.
class AndroidMavenArtifacts extends ArtifactSet {
AndroidMavenArtifacts() : super(DevelopmentArtifact.androidMaven);
@override
Future<void> update() async {
final Directory tempDir =
fs.systemTempDirectory.createTempSync('gradle_wrapper.');
injectGradleWrapperIfNeeded(tempDir);
final Status status = logger.startProgress('Downloading Android Maven dependencies...',
timeout: timeoutConfiguration.slowOperation);
final File gradle = tempDir.childFile(
platform.isWindows ? 'gradlew.bat' : 'gradlew',
);
assert(gradle.existsSync());
os.makeExecutable(gradle);
try {
final String gradleExecutable = gradle.absolute.path;
final String flutterSdk = escapePath(Cache.flutterRoot);
final RunResult processResult = await processUtils.run(
<String>[
gradleExecutable,
'-b', fs.path.join(flutterSdk, 'packages', 'flutter_tools', 'gradle', 'resolve_dependencies.gradle'),
'--project-cache-dir', tempDir.path,
'resolveDependencies',
],
environment: gradleEnv);
if (processResult.exitCode != 0) {
printError('Failed to download the Android dependencies');
}
} finally {
status.stop();
tempDir.deleteSync(recursive: true);
}
}
@override
bool isUpToDate() {
// The dependencies are downloaded and cached by Gradle.
// The tool doesn't know if the dependencies are already cached at this point.
// Therefore, call Gradle to figure this out.
return false;
}
}
class IOSEngineArtifacts extends EngineCachedArtifact { class IOSEngineArtifacts extends EngineCachedArtifact {
IOSEngineArtifacts(Cache cache) : super( IOSEngineArtifacts(Cache cache) : super(
'ios-sdk', 'ios-sdk',
cache, cache,
<DevelopmentArtifact>{ DevelopmentArtifact.iOS }, DevelopmentArtifact.iOS,
); );
@override @override
...@@ -861,7 +962,7 @@ class GradleWrapper extends CachedArtifact { ...@@ -861,7 +962,7 @@ class GradleWrapper extends CachedArtifact {
GradleWrapper(Cache cache) : super( GradleWrapper(Cache cache) : super(
'gradle_wrapper', 'gradle_wrapper',
cache, cache,
const <DevelopmentArtifact>{ DevelopmentArtifact.universal }, DevelopmentArtifact.universal,
); );
List<String> get _gradleScripts => <String>['gradlew', 'gradlew.bat']; List<String> get _gradleScripts => <String>['gradlew', 'gradlew.bat'];
...@@ -904,11 +1005,13 @@ class GradleWrapper extends CachedArtifact { ...@@ -904,11 +1005,13 @@ class GradleWrapper extends CachedArtifact {
/// Common functionality for pulling Fuchsia SDKs. /// Common functionality for pulling Fuchsia SDKs.
abstract class _FuchsiaSDKArtifacts extends CachedArtifact { abstract class _FuchsiaSDKArtifacts extends CachedArtifact {
_FuchsiaSDKArtifacts(Cache cache, String platform) _FuchsiaSDKArtifacts(Cache cache, String platform) :
:_path = 'fuchsia/sdk/core/$platform-amd64', _path = 'fuchsia/sdk/core/$platform-amd64',
super('fuchsia-$platform', cache, const <DevelopmentArtifact> { super(
DevelopmentArtifact.fuchsia, 'fuchsia-$platform',
}); cache,
DevelopmentArtifact.fuchsia,
);
final String _path; final String _path;
...@@ -924,10 +1027,11 @@ abstract class _FuchsiaSDKArtifacts extends CachedArtifact { ...@@ -924,10 +1027,11 @@ abstract class _FuchsiaSDKArtifacts extends CachedArtifact {
/// The pre-built flutter runner for Fuchsia development. /// The pre-built flutter runner for Fuchsia development.
class FlutterRunnerSDKArtifacts extends CachedArtifact { class FlutterRunnerSDKArtifacts extends CachedArtifact {
FlutterRunnerSDKArtifacts(Cache cache) FlutterRunnerSDKArtifacts(Cache cache) : super(
: super('flutter_runner', cache, const <DevelopmentArtifact>{ 'flutter_runner',
cache,
DevelopmentArtifact.flutterRunner, DevelopmentArtifact.flutterRunner,
}); );
@override @override
Directory get location => cache.getArtifactDirectory('flutter_runner'); Directory get location => cache.getArtifactDirectory('flutter_runner');
...@@ -978,7 +1082,7 @@ class IosUsbArtifacts extends CachedArtifact { ...@@ -978,7 +1082,7 @@ class IosUsbArtifacts extends CachedArtifact {
name, name,
cache, cache,
// This is universal to ensure every command checks for them first // This is universal to ensure every command checks for them first
const <DevelopmentArtifact>{ DevelopmentArtifact.universal }, DevelopmentArtifact.universal,
); );
static const List<String> artifactNames = <String>[ static const List<String> artifactNames = <String>[
...@@ -991,8 +1095,10 @@ class IosUsbArtifacts extends CachedArtifact { ...@@ -991,8 +1095,10 @@ class IosUsbArtifacts extends CachedArtifact {
]; ];
@override @override
String get dyLdLibPath { Map<String, String> get environment {
return cache.getArtifactDirectory(name).path; return <String, String>{
'DYLD_LIBRARY_PATH': cache.getArtifactDirectory(name).path,
};
} }
@override @override
...@@ -1100,6 +1206,12 @@ const List<List<String>> _windowsBinaryDirs = <List<String>>[ ...@@ -1100,6 +1206,12 @@ const List<List<String>> _windowsBinaryDirs = <List<String>>[
<String>['android-arm64-release/windows-x64', 'android-arm64-release/windows-x64.zip'], <String>['android-arm64-release/windows-x64', 'android-arm64-release/windows-x64.zip'],
]; ];
const List<List<String>> _iosBinaryDirs = <List<String>>[
<String>['ios', 'ios/artifacts.zip'],
<String>['ios-profile', 'ios-profile/artifacts.zip'],
<String>['ios-release', 'ios-release/artifacts.zip'],
];
const List<List<String>> _androidBinaryDirs = <List<String>>[ const List<List<String>> _androidBinaryDirs = <List<String>>[
<String>['android-x86', 'android-x86/artifacts.zip'], <String>['android-x86', 'android-x86/artifacts.zip'],
<String>['android-x64', 'android-x64/artifacts.zip'], <String>['android-x64', 'android-x64/artifacts.zip'],
...@@ -1111,12 +1223,6 @@ const List<List<String>> _androidBinaryDirs = <List<String>>[ ...@@ -1111,12 +1223,6 @@ const List<List<String>> _androidBinaryDirs = <List<String>>[
<String>['android-arm64-release', 'android-arm64-release/artifacts.zip'], <String>['android-arm64-release', 'android-arm64-release/artifacts.zip'],
]; ];
const List<List<String>> _iosBinaryDirs = <List<String>>[
<String>['ios', 'ios/artifacts.zip'],
<String>['ios-profile', 'ios-profile/artifacts.zip'],
<String>['ios-release', 'ios-release/artifacts.zip'],
];
const List<List<String>> _dartSdks = <List<String>> [ const List<List<String>> _dartSdks = <List<String>> [
<String>['darwin-x64', 'dart-sdk-darwin-x64.zip'], <String>['darwin-x64', 'dart-sdk-darwin-x64.zip'],
<String>['linux-x64', 'dart-sdk-linux-x64.zip'], <String>['linux-x64', 'dart-sdk-linux-x64.zip'],
......
packages/flutter_tools/lib/src/commands/build_aar.dart
View file @ 8a1bf5b8
...@@ -9,7 +9,7 @@ import '../base/os.dart'; ...@@ -9,7 +9,7 @@ import '../base/os.dart';
import '../build_info.dart'; import '../build_info.dart';
import '../project.dart'; import '../project.dart';
import '../reporting/reporting.dart'; import '../reporting/reporting.dart';
import '../runner/flutter_command.dart' show DevelopmentArtifact, FlutterCommandResult; import '../runner/flutter_command.dart' show FlutterCommandResult;
import 'build.dart'; import 'build.dart';
class BuildAarCommand extends BuildSubCommand { class BuildAarCommand extends BuildSubCommand {
...@@ -52,12 +52,6 @@ class BuildAarCommand extends BuildSubCommand { ...@@ -52,12 +52,6 @@ class BuildAarCommand extends BuildSubCommand {
return usage; return usage;
} }
@override
Future<Set<DevelopmentArtifact>> get requiredArtifacts async => const <DevelopmentArtifact>{
DevelopmentArtifact.universal,
DevelopmentArtifact.android,
};
@override @override
final String description = 'Build a repository containing an AAR and a POM file.\n\n' final String description = 'Build a repository containing an AAR and a POM file.\n\n'
'The POM file is used to include the dependencies that the AAR was compiled against.\n\n' 'The POM file is used to include the dependencies that the AAR was compiled against.\n\n'
......
packages/flutter_tools/lib/src/commands/build_apk.dart
View file @ 8a1bf5b8
...@@ -10,7 +10,7 @@ import '../build_info.dart'; ...@@ -10,7 +10,7 @@ import '../build_info.dart';
import '../globals.dart'; import '../globals.dart';
import '../project.dart'; import '../project.dart';
import '../reporting/reporting.dart'; import '../reporting/reporting.dart';
import '../runner/flutter_command.dart' show DevelopmentArtifact, FlutterCommandResult; import '../runner/flutter_command.dart' show FlutterCommandResult;
import 'build.dart'; import 'build.dart';
class BuildApkCommand extends BuildSubCommand { class BuildApkCommand extends BuildSubCommand {
...@@ -69,12 +69,6 @@ class BuildApkCommand extends BuildSubCommand { ...@@ -69,12 +69,6 @@ class BuildApkCommand extends BuildSubCommand {
return usage; return usage;
} }
@override
Future<Set<DevelopmentArtifact>> get requiredArtifacts async => const <DevelopmentArtifact>{
DevelopmentArtifact.universal,
DevelopmentArtifact.android,
};
@override @override
Future<FlutterCommandResult> runCommand() async { Future<FlutterCommandResult> runCommand() async {
final BuildInfo buildInfo = getBuildInfo(); final BuildInfo buildInfo = getBuildInfo();
......
packages/flutter_tools/lib/src/commands/doctor.dart
View file @ 8a1bf5b8
...@@ -37,7 +37,7 @@ class DoctorCommand extends FlutterCommand { ...@@ -37,7 +37,7 @@ class DoctorCommand extends FlutterCommand {
// This is required because we use gen_snapshot to check if the host // This is required because we use gen_snapshot to check if the host
// machine can execute the provided artifacts. See `_genSnapshotRuns` // machine can execute the provided artifacts. See `_genSnapshotRuns`
// in `doctor.dart`. // in `doctor.dart`.
DevelopmentArtifact.android, DevelopmentArtifact.androidGenSnapshot,
}; };
} }
......
packages/flutter_tools/lib/src/commands/precache.dart
View file @ 8a1bf5b8
...@@ -10,13 +10,23 @@ import '../runner/flutter_command.dart'; ...@@ -10,13 +10,23 @@ import '../runner/flutter_command.dart';
import '../version.dart'; import '../version.dart';
class PrecacheCommand extends FlutterCommand { class PrecacheCommand extends FlutterCommand {
PrecacheCommand() { PrecacheCommand({bool verboseHelp = false}) {
argParser.addFlag('all-platforms', abbr: 'a', negatable: false, argParser.addFlag('all-platforms', abbr: 'a', negatable: false,
help: 'Precache artifacts for all host platforms.'); help: 'Precache artifacts for all host platforms.');
argParser.addFlag('force', abbr: 'f', negatable: false, argParser.addFlag('force', abbr: 'f', negatable: false,
help: 'Force downloading of artifacts.'); help: 'Force downloading of artifacts.');
argParser.addFlag('android', negatable: true, defaultsTo: true, argParser.addFlag('android', negatable: true, defaultsTo: true,
help: 'Precache artifacts for Android development.'); help: 'Precache artifacts for Android development.',
hide: verboseHelp);
argParser.addFlag('android_gen_snapshot', negatable: true, defaultsTo: true,
help: 'Precache gen_snapshot for Android development.',
hide: !verboseHelp);
argParser.addFlag('android_maven', negatable: true, defaultsTo: true,
help: 'Precache Gradle dependencies for Android development.',
hide: !verboseHelp);
argParser.addFlag('android_internal_build', negatable: true, defaultsTo: false,
help: 'Precache dependencies for internal Android development.',
hide: !verboseHelp);
argParser.addFlag('ios', negatable: true, defaultsTo: true, argParser.addFlag('ios', negatable: true, defaultsTo: true,
help: 'Precache artifacts for iOS development.'); help: 'Precache artifacts for iOS development.');
argParser.addFlag('web', negatable: true, defaultsTo: false, argParser.addFlag('web', negatable: true, defaultsTo: false,
...@@ -58,6 +68,10 @@ class PrecacheCommand extends FlutterCommand { ...@@ -58,6 +68,10 @@ class PrecacheCommand extends FlutterCommand {
if (argResults[artifact.name]) { if (argResults[artifact.name]) {
requiredArtifacts.add(artifact); requiredArtifacts.add(artifact);
} }
// The `android` flag expands to android_gen_snapshot, android_maven, android_internal_build.
if (artifact.name.startsWith('android_') && argResults['android']) {
requiredArtifacts.add(artifact);
}
} }
final bool forceUpdate = argResults['force']; final bool forceUpdate = argResults['force'];
if (forceUpdate || !cache.isUpToDate()) { if (forceUpdate || !cache.isUpToDate()) {
......
packages/flutter_tools/lib/src/commands/upgrade.dart
View file @ 8a1bf5b8
...@@ -10,6 +10,7 @@ import '../base/common.dart'; ...@@ -10,6 +10,7 @@ import '../base/common.dart';
import '../base/file_system.dart'; import '../base/file_system.dart';
import '../base/io.dart'; import '../base/io.dart';
import '../base/os.dart'; import '../base/os.dart';
import '../base/platform.dart';
import '../base/process.dart'; import '../base/process.dart';
import '../cache.dart'; import '../cache.dart';
import '../dart/pub.dart'; import '../dart/pub.dart';
...@@ -130,6 +131,7 @@ class UpgradeCommandRunner { ...@@ -130,6 +131,7 @@ class UpgradeCommandRunner {
], ],
workingDirectory: Cache.flutterRoot, workingDirectory: Cache.flutterRoot,
allowReentrantFlutter: true, allowReentrantFlutter: true,
environment: platform.environment,
); );
if (code != 0) { if (code != 0) {
throwToolExit(null, exitCode: code); throwToolExit(null, exitCode: code);
...@@ -248,6 +250,7 @@ class UpgradeCommandRunner { ...@@ -248,6 +250,7 @@ class UpgradeCommandRunner {
], ],
workingDirectory: Cache.flutterRoot, workingDirectory: Cache.flutterRoot,
allowReentrantFlutter: true, allowReentrantFlutter: true,
environment: platform.environment,
); );
if (code != 0) { if (code != 0) {
throwToolExit(null, exitCode: code); throwToolExit(null, exitCode: code);
......
packages/flutter_tools/lib/src/runner/flutter_command.dart
View file @ 8a1bf5b8
...@@ -676,7 +676,7 @@ DevelopmentArtifact _artifactFromTargetPlatform(TargetPlatform targetPlatform) { ...@@ -676,7 +676,7 @@ DevelopmentArtifact _artifactFromTargetPlatform(TargetPlatform targetPlatform) {
case TargetPlatform.android_arm64: case TargetPlatform.android_arm64:
case TargetPlatform.android_x64: case TargetPlatform.android_x64:
case TargetPlatform.android_x86: case TargetPlatform.android_x86:
return DevelopmentArtifact.android; return DevelopmentArtifact.androidGenSnapshot;
case TargetPlatform.web_javascript: case TargetPlatform.web_javascript:
return DevelopmentArtifact.web; return DevelopmentArtifact.web;
case TargetPlatform.ios: case TargetPlatform.ios:
......
packages/flutter_tools/templates/module/android/host_app_common/app.tmpl/build.gradle.tmpl
View file @ 8a1bf5b8
...@@ -47,9 +47,9 @@ dependencies { ...@@ -47,9 +47,9 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
{{/androidX}} {{/androidX}}
{{^androidX}} {{^androidX}}
implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.android.support:design:27.1.1' implementation 'com.android.support:design:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
{{/androidX}} {{/androidX}}
......
packages/flutter_tools/test/general.shard/cache_test.dart
View file @ 8a1bf5b8
...@@ -8,8 +8,11 @@ import 'package:file_testing/file_testing.dart'; ...@@ -8,8 +8,11 @@ import 'package:file_testing/file_testing.dart';
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
import 'package:mockito/mockito.dart'; import 'package:mockito/mockito.dart';
import 'package:platform/platform.dart'; import 'package:platform/platform.dart';
import 'package:process/process.dart';
import 'package:flutter_tools/src/android/gradle.dart';
import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/base/common.dart';
import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/io.dart' show InternetAddress, SocketException; import 'package:flutter_tools/src/base/io.dart' show InternetAddress, SocketException;
...@@ -136,18 +139,30 @@ void main() { ...@@ -136,18 +139,30 @@ void main() {
when(artifact1.isUpToDate()).thenReturn(true); when(artifact1.isUpToDate()).thenReturn(true);
when(artifact2.isUpToDate()).thenReturn(false); when(artifact2.isUpToDate()).thenReturn(false);
final Cache cache = Cache(artifacts: <CachedArtifact>[artifact1, artifact2]); final Cache cache = Cache(artifacts: <CachedArtifact>[artifact1, artifact2]);
await cache.updateAll(<DevelopmentArtifact>{}); await cache.updateAll(<DevelopmentArtifact>{
verifyNever(artifact1.update(<DevelopmentArtifact>{})); null,
verify(artifact2.update(<DevelopmentArtifact>{})); });
verifyNever(artifact1.update());
verify(artifact2.update());
}); });
testUsingContext('getter dyLdLibEntry concatenates the output of each artifact\'s dyLdLibEntry getter', () async { testUsingContext('getter dyLdLibEntry concatenates the output of each artifact\'s dyLdLibEntry getter', () async {
final CachedArtifact artifact1 = MockCachedArtifact(); final IosUsbArtifacts artifact1 = MockIosUsbArtifacts();
final CachedArtifact artifact2 = MockCachedArtifact(); final IosUsbArtifacts artifact2 = MockIosUsbArtifacts();
final CachedArtifact artifact3 = MockCachedArtifact(); final IosUsbArtifacts artifact3 = MockIosUsbArtifacts();
when(artifact1.dyLdLibPath).thenReturn('/path/to/alpha:/path/to/beta'); when(artifact1.environment)
when(artifact2.dyLdLibPath).thenReturn('/path/to/gamma:/path/to/delta:/path/to/epsilon'); .thenReturn(<String, String>{
when(artifact3.dyLdLibPath).thenReturn(''); // Empty output 'DYLD_LIBRARY_PATH': '/path/to/alpha:/path/to/beta',
});
when(artifact2.environment)
.thenReturn(<String, String>{
'DYLD_LIBRARY_PATH': '/path/to/gamma:/path/to/delta:/path/to/epsilon',
});
when(artifact3.environment)
.thenReturn(<String, String>{
'DYLD_LIBRARY_PATH': '',
});
final Cache cache = Cache(artifacts: <CachedArtifact>[artifact1, artifact2, artifact3]); final Cache cache = Cache(artifacts: <CachedArtifact>[artifact1, artifact2, artifact3]);
expect(cache.dyLdLibEntry.key, 'DYLD_LIBRARY_PATH'); expect(cache.dyLdLibEntry.key, 'DYLD_LIBRARY_PATH');
expect( expect(
cache.dyLdLibEntry.value, cache.dyLdLibEntry.value,
...@@ -163,18 +178,20 @@ void main() { ...@@ -163,18 +178,20 @@ void main() {
when(artifact2.isUpToDate()).thenReturn(false); when(artifact2.isUpToDate()).thenReturn(false);
final MockInternetAddress address = MockInternetAddress(); final MockInternetAddress address = MockInternetAddress();
when(address.host).thenReturn('storage.googleapis.com'); when(address.host).thenReturn('storage.googleapis.com');
when(artifact1.update(<DevelopmentArtifact>{})).thenThrow(SocketException( when(artifact1.update()).thenThrow(SocketException(
'Connection reset by peer', 'Connection reset by peer',
address: address, address: address,
)); ));
final Cache cache = Cache(artifacts: <CachedArtifact>[artifact1, artifact2]); final Cache cache = Cache(artifacts: <CachedArtifact>[artifact1, artifact2]);
try { try {
await cache.updateAll(<DevelopmentArtifact>{}); await cache.updateAll(<DevelopmentArtifact>{
null,
});
fail('Mock thrown exception expected'); fail('Mock thrown exception expected');
} catch (e) { } catch (e) {
verify(artifact1.update(<DevelopmentArtifact>{})); verify(artifact1.update());
// Don't continue when retrieval fails. // Don't continue when retrieval fails.
verifyNever(artifact2.update(<DevelopmentArtifact>{})); verifyNever(artifact2.update());
expect( expect(
testLogger.errorText, testLogger.errorText,
contains('https://flutter.dev/community/china'), contains('https://flutter.dev/community/china'),
...@@ -226,6 +243,7 @@ void main() { ...@@ -226,6 +243,7 @@ void main() {
binaryDirs: <List<String>>[ binaryDirs: <List<String>>[
<String>['bin_dir', 'unused_url_path'], <String>['bin_dir', 'unused_url_path'],
], ],
requiredArtifacts: DevelopmentArtifact.universal,
); );
await artifact.updateInner(); await artifact.updateInner();
final Directory dir = memoryFileSystem.systemTempDirectory final Directory dir = memoryFileSystem.systemTempDirectory
...@@ -244,25 +262,53 @@ void main() { ...@@ -244,25 +262,53 @@ void main() {
}); });
}); });
testUsingContext('throws tool exit on fs exception', () async { group('AndroidMavenArtifacts', () {
final FakeCachedArtifact fakeCachedArtifact = FakeCachedArtifact( MemoryFileSystem memoryFileSystem;
cache: MockCache(), MockProcessManager processManager;
requiredArtifacts: <DevelopmentArtifact>{ MockCache mockCache;
DevelopmentArtifact.android,
} setUp(() {
); memoryFileSystem = MemoryFileSystem();
final Directory mockDirectory = MockDirectory(); processManager = MockProcessManager();
when(fakeCachedArtifact.cache.getArtifactDirectory(any)) mockCache = MockCache();
.thenReturn(mockDirectory); });
when(mockDirectory.existsSync()).thenReturn(false);
when(mockDirectory.createSync(recursive: true)) test('development artifact', () async {
.thenThrow(const FileSystemException()); final AndroidMavenArtifacts mavenArtifacts = AndroidMavenArtifacts();
expect(mavenArtifacts.developmentArtifact, DevelopmentArtifact.androidMaven);
expect(() => fakeCachedArtifact.update(<DevelopmentArtifact>{ });
DevelopmentArtifact.android,
}), throwsA(isInstanceOf<ToolExit>())); testUsingContext('update', () async {
}, overrides: <Type, Generator>{ final AndroidMavenArtifacts mavenArtifacts = AndroidMavenArtifacts();
FileSystem: () => MemoryFileSystem(), expect(mavenArtifacts.isUpToDate(), isFalse);
final Directory gradleWrapperDir = fs.systemTempDirectory.createTempSync('gradle_wrapper.');
when(mockCache.getArtifactDirectory('gradle_wrapper')).thenReturn(gradleWrapperDir);
fs.directory(gradleWrapperDir.childDirectory('gradle').childDirectory('wrapper'))
.createSync(recursive: true);
fs.file(fs.path.join(gradleWrapperDir.path, 'gradlew')).writeAsStringSync('irrelevant');
fs.file(fs.path.join(gradleWrapperDir.path, 'gradlew.bat')).writeAsStringSync('irrelevant');
when(processManager.run(any, environment: captureAnyNamed('environment')))
.thenAnswer((Invocation invocation) {
final List<String> args = invocation.positionalArguments[0];
expect(args.length, 6);
expect(args[1], '-b');
expect(args[2].endsWith('resolve_dependencies.gradle'), isTrue);
expect(args[5], 'resolveDependencies');
expect(invocation.namedArguments[#environment], gradleEnv);
return Future<ProcessResult>.value(ProcessResult(0, 0, '', ''));
});
await mavenArtifacts.update();
expect(mavenArtifacts.isUpToDate(), isFalse);
}, overrides: <Type, Generator>{
Cache: ()=> mockCache,
FileSystem: () => memoryFileSystem,
ProcessManager: () => processManager,
});
}); });
} }
...@@ -270,7 +316,7 @@ class FakeCachedArtifact extends EngineCachedArtifact { ...@@ -270,7 +316,7 @@ class FakeCachedArtifact extends EngineCachedArtifact {
FakeCachedArtifact({ FakeCachedArtifact({
String stampName = 'STAMP', String stampName = 'STAMP',
@required Cache cache, @required Cache cache,
Set<DevelopmentArtifact> requiredArtifacts = const <DevelopmentArtifact>{}, DevelopmentArtifact requiredArtifacts,
this.binaryDirs = const <List<String>>[], this.binaryDirs = const <List<String>>[],
this.licenseDirs = const <String>[], this.licenseDirs = const <String>[],
this.packageDirs = const <String>[], this.packageDirs = const <String>[],
...@@ -290,12 +336,14 @@ class FakeCachedArtifact extends EngineCachedArtifact { ...@@ -290,12 +336,14 @@ class FakeCachedArtifact extends EngineCachedArtifact {
List<String> getPackageDirs() => packageDirs; List<String> getPackageDirs() => packageDirs;
} }
class MockProcessManager extends Mock implements ProcessManager {}
class MockFileSystem extends Mock implements FileSystem {} class MockFileSystem extends Mock implements FileSystem {}
class MockFile extends Mock implements File {} class MockFile extends Mock implements File {}
class MockDirectory extends Mock implements Directory {} class MockDirectory extends Mock implements Directory {}
class MockRandomAccessFile extends Mock implements RandomAccessFile {} class MockRandomAccessFile extends Mock implements RandomAccessFile {}
class MockCachedArtifact extends Mock implements CachedArtifact {} class MockCachedArtifact extends Mock implements CachedArtifact {}
class MockIosUsbArtifacts extends Mock implements IosUsbArtifacts {}
class MockInternetAddress extends Mock implements InternetAddress {} class MockInternetAddress extends Mock implements InternetAddress {}
class MockCache extends Mock implements Cache {} class MockCache extends Mock implements Cache {}
class MockOperatingSystemUtils extends Mock implements OperatingSystemUtils {} class MockOperatingSystemUtils extends Mock implements OperatingSystemUtils {}
packages/flutter_tools/test/general.shard/commands/precache_test.dart
View file @ 8a1bf5b8
...@@ -27,12 +27,24 @@ void main() { ...@@ -27,12 +27,24 @@ void main() {
final PrecacheCommand command = PrecacheCommand(); final PrecacheCommand command = PrecacheCommand();
applyMocksToCommand(command); applyMocksToCommand(command);
await createTestCommandRunner(command).run( await createTestCommandRunner(command).run(
const <String>['precache', '--ios', '--android', '--web', '--macos', '--linux', '--windows', '--fuchsia', '--flutter_runner'] const <String>[
'precache',
'--ios',
'--android',
'--web',
'--macos',
'--linux',
'--windows',
'--fuchsia',
'--flutter_runner',
]
); );
expect(artifacts, unorderedEquals(<DevelopmentArtifact>{ expect(artifacts, unorderedEquals(<DevelopmentArtifact>{
DevelopmentArtifact.universal, DevelopmentArtifact.universal,
DevelopmentArtifact.iOS, DevelopmentArtifact.iOS,
DevelopmentArtifact.android, DevelopmentArtifact.androidGenSnapshot,
DevelopmentArtifact.androidMaven,
DevelopmentArtifact.androidInternalBuild,
DevelopmentArtifact.web, DevelopmentArtifact.web,
DevelopmentArtifact.macOS, DevelopmentArtifact.macOS,
DevelopmentArtifact.linux, DevelopmentArtifact.linux,
...@@ -44,6 +56,54 @@ void main() { ...@@ -44,6 +56,54 @@ void main() {
Cache: () => cache, Cache: () => cache,
}); });
testUsingContext('Expands android artifacts when the android flag is used', () async {
// Release lock between test cases.
Cache.releaseLockEarly();
final PrecacheCommand command = PrecacheCommand();
applyMocksToCommand(command);
await createTestCommandRunner(command).run(
const <String>[
'precache',
'--no-ios',
'--android',
]
);
expect(artifacts, unorderedEquals(<DevelopmentArtifact>{
DevelopmentArtifact.universal,
DevelopmentArtifact.androidGenSnapshot,
DevelopmentArtifact.androidMaven,
DevelopmentArtifact.androidInternalBuild,
}));
}, overrides: <Type, Generator>{
Cache: () => cache,
});
testUsingContext('Adds artifact flags to requested android artifacts', () async {
// Release lock between test cases.
Cache.releaseLockEarly();
final PrecacheCommand command = PrecacheCommand();
applyMocksToCommand(command);
await createTestCommandRunner(command).run(
const <String>[
'precache',
'--no-ios',
'--android_gen_snapshot',
'--android_maven',
'--android_internal_build',
]
);
expect(artifacts, unorderedEquals(<DevelopmentArtifact>{
DevelopmentArtifact.universal,
DevelopmentArtifact.androidGenSnapshot,
DevelopmentArtifact.androidMaven,
DevelopmentArtifact.androidInternalBuild,
}));
}, overrides: <Type, Generator>{
Cache: () => cache,
});
final MockFlutterVersion flutterVersion = MockFlutterVersion(); final MockFlutterVersion flutterVersion = MockFlutterVersion();
when(flutterVersion.isMaster).thenReturn(false); when(flutterVersion.isMaster).thenReturn(false);
...@@ -53,18 +113,31 @@ void main() { ...@@ -53,18 +113,31 @@ void main() {
final PrecacheCommand command = PrecacheCommand(); final PrecacheCommand command = PrecacheCommand();
applyMocksToCommand(command); applyMocksToCommand(command);
await createTestCommandRunner(command).run( await createTestCommandRunner(command).run(
const <String>['precache', '--ios', '--android', '--web', '--macos', '--linux', '--windows', '--fuchsia', '--flutter_runner'] const <String>[
'precache',
'--ios',
'--android_gen_snapshot',
'--android_maven',
'--android_internal_build',
'--web',
'--macos',
'--linux',
'--windows',
'--fuchsia',
'--flutter_runner',
]
); );
expect(artifacts, unorderedEquals(<DevelopmentArtifact>{ expect(artifacts, unorderedEquals(<DevelopmentArtifact>{
DevelopmentArtifact.universal, DevelopmentArtifact.universal,
DevelopmentArtifact.iOS, DevelopmentArtifact.iOS,
DevelopmentArtifact.android, DevelopmentArtifact.androidGenSnapshot,
})); DevelopmentArtifact.androidMaven,
DevelopmentArtifact.androidInternalBuild,
}));
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Cache: () => cache, Cache: () => cache,
FlutterVersion: () => flutterVersion, FlutterVersion: () => flutterVersion,
}); });
testUsingContext('Downloads artifacts when --force is provided', () async { testUsingContext('Downloads artifacts when --force is provided', () async {
when(cache.isUpToDate()).thenReturn(true); when(cache.isUpToDate()).thenReturn(true);
// Release lock between test cases. // Release lock between test cases.
...@@ -73,10 +146,12 @@ void main() { ...@@ -73,10 +146,12 @@ void main() {
applyMocksToCommand(command); applyMocksToCommand(command);
await createTestCommandRunner(command).run(const <String>['precache', '--force']); await createTestCommandRunner(command).run(const <String>['precache', '--force']);
expect(artifacts, unorderedEquals(<DevelopmentArtifact>{ expect(artifacts, unorderedEquals(<DevelopmentArtifact>{
DevelopmentArtifact.universal, DevelopmentArtifact.universal,
DevelopmentArtifact.iOS, DevelopmentArtifact.iOS,
DevelopmentArtifact.android, DevelopmentArtifact.androidGenSnapshot,
})); DevelopmentArtifact.androidMaven,
DevelopmentArtifact.androidInternalBuild,
}));
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Cache: () => cache, Cache: () => cache,
FlutterVersion: () => flutterVersion, FlutterVersion: () => flutterVersion,
......
packages/flutter_tools/test/general.shard/commands/run_test.dart
View file @ 8a1bf5b8
...@@ -138,7 +138,7 @@ void main() { ...@@ -138,7 +138,7 @@ void main() {
expect(await RunCommand().requiredArtifacts, unorderedEquals(<DevelopmentArtifact>{ expect(await RunCommand().requiredArtifacts, unorderedEquals(<DevelopmentArtifact>{
DevelopmentArtifact.universal, DevelopmentArtifact.universal,
DevelopmentArtifact.android, DevelopmentArtifact.androidGenSnapshot,
})); }));
when(mockDeviceManager.getDevices()).thenAnswer((Invocation invocation) { when(mockDeviceManager.getDevices()).thenAnswer((Invocation invocation) {
...@@ -162,7 +162,7 @@ void main() { ...@@ -162,7 +162,7 @@ void main() {
expect(await RunCommand().requiredArtifacts, unorderedEquals(<DevelopmentArtifact>{ expect(await RunCommand().requiredArtifacts, unorderedEquals(<DevelopmentArtifact>{
DevelopmentArtifact.universal, DevelopmentArtifact.universal,
DevelopmentArtifact.iOS, DevelopmentArtifact.iOS,
DevelopmentArtifact.android, DevelopmentArtifact.androidGenSnapshot,
})); }));
when(mockDeviceManager.getDevices()).thenAnswer((Invocation invocation) { when(mockDeviceManager.getDevices()).thenAnswer((Invocation invocation) {
......
packages/flutter_tools/test/general.shard/commands/upgrade_test.dart
View file @ 8a1bf5b8
...@@ -5,12 +5,14 @@ ...@@ -5,12 +5,14 @@
import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/base/common.dart';
import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/base/os.dart'; import 'package:flutter_tools/src/base/os.dart';
import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/commands/upgrade.dart'; import 'package:flutter_tools/src/commands/upgrade.dart';
import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart';
import 'package:flutter_tools/src/version.dart'; import 'package:flutter_tools/src/version.dart';
import 'package:mockito/mockito.dart'; import 'package:mockito/mockito.dart';
import 'package:platform/platform.dart';
import 'package:process/process.dart'; import 'package:process/process.dart';
import '../../src/common.dart'; import '../../src/common.dart';
...@@ -22,6 +24,7 @@ void main() { ...@@ -22,6 +24,7 @@ void main() {
FakeUpgradeCommandRunner fakeCommandRunner; FakeUpgradeCommandRunner fakeCommandRunner;
UpgradeCommandRunner realCommandRunner; UpgradeCommandRunner realCommandRunner;
MockProcessManager processManager; MockProcessManager processManager;
FakePlatform fakePlatform;
final MockFlutterVersion flutterVersion = MockFlutterVersion(); final MockFlutterVersion flutterVersion = MockFlutterVersion();
const GitTagVersion gitTagVersion = GitTagVersion(1, 2, 3, 4, 5, 'asd'); const GitTagVersion gitTagVersion = GitTagVersion(1, 2, 3, 4, 5, 'asd');
when(flutterVersion.channel).thenReturn('dev'); when(flutterVersion.channel).thenReturn('dev');
...@@ -43,9 +46,13 @@ void main() { ...@@ -43,9 +46,13 @@ void main() {
return Future<Process>.value(createMockProcess()); return Future<Process>.value(createMockProcess());
}); });
fakeCommandRunner.willHaveUncomittedChanges = false; fakeCommandRunner.willHaveUncomittedChanges = false;
fakePlatform = FakePlatform()..environment = <String, String>{
'ENV1': 'irrelevant',
'ENV2': 'irrelevant',
};
}); });
test('throws on unknown tag, official branch, noforce', () async { testUsingContext('throws on unknown tag, official branch, noforce', () async {
final Future<FlutterCommandResult> result = fakeCommandRunner.runCommand( final Future<FlutterCommandResult> result = fakeCommandRunner.runCommand(
false, false,
false, false,
...@@ -53,6 +60,8 @@ void main() { ...@@ -53,6 +60,8 @@ void main() {
flutterVersion, flutterVersion,
); );
expect(result, throwsA(isInstanceOf<ToolExit>())); expect(result, throwsA(isInstanceOf<ToolExit>()));
}, overrides: <Type, Generator>{
Platform: () => fakePlatform,
}); });
testUsingContext('does not throw on unknown tag, official branch, force', () async { testUsingContext('does not throw on unknown tag, official branch, force', () async {
...@@ -65,9 +74,10 @@ void main() { ...@@ -65,9 +74,10 @@ void main() {
expect(await result, null); expect(await result, null);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
ProcessManager: () => processManager, ProcessManager: () => processManager,
Platform: () => fakePlatform,
}); });
test('throws tool exit with uncommitted changes', () async { testUsingContext('throws tool exit with uncommitted changes', () async {
fakeCommandRunner.willHaveUncomittedChanges = true; fakeCommandRunner.willHaveUncomittedChanges = true;
final Future<FlutterCommandResult> result = fakeCommandRunner.runCommand( final Future<FlutterCommandResult> result = fakeCommandRunner.runCommand(
false, false,
...@@ -76,6 +86,8 @@ void main() { ...@@ -76,6 +86,8 @@ void main() {
flutterVersion, flutterVersion,
); );
expect(result, throwsA(isA<ToolExit>())); expect(result, throwsA(isA<ToolExit>()));
}, overrides: <Type, Generator>{
Platform: () => fakePlatform,
}); });
testUsingContext('does not throw tool exit with uncommitted changes and force', () async { testUsingContext('does not throw tool exit with uncommitted changes and force', () async {
...@@ -90,6 +102,7 @@ void main() { ...@@ -90,6 +102,7 @@ void main() {
expect(await result, null); expect(await result, null);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
ProcessManager: () => processManager, ProcessManager: () => processManager,
Platform: () => fakePlatform,
}); });
testUsingContext('Doesn\'t throw on known tag, dev branch, no force', () async { testUsingContext('Doesn\'t throw on known tag, dev branch, no force', () async {
...@@ -102,6 +115,7 @@ void main() { ...@@ -102,6 +115,7 @@ void main() {
expect(await result, null); expect(await result, null);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
ProcessManager: () => processManager, ProcessManager: () => processManager,
Platform: () => fakePlatform,
}); });
testUsingContext('verifyUpstreamConfigured', () async { testUsingContext('verifyUpstreamConfigured', () async {
...@@ -116,6 +130,57 @@ void main() { ...@@ -116,6 +130,57 @@ void main() {
await realCommandRunner.verifyUpstreamConfigured(); await realCommandRunner.verifyUpstreamConfigured();
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
ProcessManager: () => processManager, ProcessManager: () => processManager,
Platform: () => fakePlatform,
});
testUsingContext('flutterUpgradeContinue passes env variables to child process', () async {
await realCommandRunner.flutterUpgradeContinue();
final VerificationResult result = verify(processManager.start(
<String>[
fs.path.join('bin', 'flutter'),
'upgrade',
'--continue',
'--no-version-check',
],
environment: captureAnyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
));
expect(result.captured.first, fakePlatform.environment);
}, overrides: <Type, Generator>{
ProcessManager: () => processManager,
Platform: () => fakePlatform,
});
testUsingContext('precacheArtifacts passes env variables to child process', () async {
final List<String> precacheCommand = <String>[
fs.path.join('bin', 'flutter'),
'--no-color',
'--no-version-check',
'precache',
];
when(processManager.start(
precacheCommand,
environment: anyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
)).thenAnswer((Invocation invocation) async {
return Future<Process>.value(createMockProcess());
});
await realCommandRunner.precacheArtifacts();
final VerificationResult result = verify(processManager.start(
precacheCommand,
environment: captureAnyNamed('environment'),
workingDirectory: anyNamed('workingDirectory'),
));
expect(result.captured.first, fakePlatform.environment);
}, overrides: <Type, Generator>{
ProcessManager: () => processManager,
Platform: () => fakePlatform,
}); });
}); });
......
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