firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the Gradle plugin to use --local-engine instead of the deprecated --engine-src-path (#4255)

Browse Source
This commit is contained in:
Jason Simmons 2016-05-27 17:12:52 -07:00
parent aee32698ac
commit d6147fd7fa
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/hello_android/buildSrc/src/main/groovy/FlutterPlugin.groovy
View File

@ -19,7 +19,7 @@ import org.gradle.api.tasks.TaskAction
class FlutterPlugin implements Plugin<Project> { class FlutterPlugin implements Plugin<Project> {
private File sdkDir private File sdkDir
private File engineSrcDir private String localEngine
@Override @Override
void apply(Project project) { void apply(Project project) {
@ -56,13 +56,7 @@ class FlutterPlugin implements Plugin<Project> {
} }
} }
String engineSrcPath = properties.getProperty("flutter.engineSrcPath") localEngine = properties.getProperty("flutter.localEngine")
if (engineSrcPath != null) {
engineSrcDir = project.file(engineSrcPath)
if (!engineSrcDir.isDirectory()) {
throw new GradleException("flutter.engineSrcPath must be a Flutter engine source directory")
}
}
project.extensions.create("flutter", FlutterExtension) project.extensions.create("flutter", FlutterExtension)
project.dependencies.add("compile", project.files(flutterJar)) project.dependencies.add("compile", project.files(flutterJar))
@ -78,7 +72,7 @@ class FlutterPlugin implements Plugin<Project> {
sdkDir this.sdkDir sdkDir this.sdkDir
sourceDir project.file(project.flutter.source) sourceDir project.file(project.flutter.source)
intermediateDir project.file("${project.buildDir}/${AndroidProject.FD_INTERMEDIATES}/flutter") intermediateDir project.file("${project.buildDir}/${AndroidProject.FD_INTERMEDIATES}/flutter")
engineSrcDir this.engineSrcDir localEngine this.localEngine
} }
project.android.applicationVariants.all { variant -> project.android.applicationVariants.all { variant ->
@ -106,7 +100,7 @@ class FlutterTask extends DefaultTask {
@OutputDirectory @OutputDirectory
File intermediateDir File intermediateDir
File engineSrcDir String localEngine
String getFlxPath() { String getFlxPath() {
return "${intermediateDir}/app.flx" return "${intermediateDir}/app.flx"
@ -122,8 +116,8 @@ class FlutterTask extends DefaultTask {
project.exec { project.exec {
executable "${sdkDir}/bin/flutter" executable "${sdkDir}/bin/flutter"
workingDir sourceDir workingDir sourceDir
if (engineSrcDir != null) { if (localEngine != null) {
args "--engine-src-path", engineSrcDir args "--local-engine", localEngine
} }
args "build", "flx" args "build", "flx"
args "-o", flxPath args "-o", flxPath