Make new project template gradle-based for Android. (#7902)

* Make new project template gradle-based for Android.

With this change, the 'new project' template uses the same gradle-based build for Android as the hello_services example. This has some implications on build performance, since we're now building a complete Android app instead of just combining a pre-compiled .dex with the Flutter assets.

The very first build is a little over 2x slower, since it needs to download gradle and build the build scripts before getting to the actual code. Subsequent builds with changes to the code are comparable to the old builds. Null builds are faster. Enabling the gradle daemon speeds up subsequent builds by around 5s.

* Move Flutter Gradle plugin to Flutter root.

examples/hello_services/android/app/build.gradle

+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withInputStream { stream ->
+        localProperties.load(stream)
+    }
+}
+
+def flutterRoot = localProperties.getProperty('flutter.sdk')
+if (flutterRoot == null) {
+    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+}
+
 apply plugin: 'com.android.application'
-apply plugin: 'flutter'
+apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 25

examples/hello_services/android/buildSrc/build.gradle

-repositories {
-  jcenter()
-}
-
-dependencies {
-  compile "com.android.tools.build:gradle:2.2.3"
-}

examples/hello_services/android/buildSrc/src/main/resources/META-INF/gradle-plugins/flutter.properties

-implementation-class=io.flutter.gradle.FlutterPlugin

examples/hello_services/android/buildSrc/src/main/groovy/FlutterPlugin.groovy → packages/flutter_tools/gradle/flutter.gradle

-// Copyright 2016 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.
-
-package io.flutter.gradle
-
 import java.nio.file.Path
 import java.nio.file.Paths
 
@@ -21,6 +15,17 @@ import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.bundling.Jar
 
+buildscript {
+  repositories {
+    jcenter()
+  }
+  dependencies {
+    classpath 'com.android.tools.build:gradle:2.2.3'
+  }
+}
+
+apply plugin: FlutterPlugin
+
 class FlutterPlugin implements Plugin<Project> {
     private File flutterRoot
     private String localEngine

packages/flutter_tools/lib/src/android/gradle.dart

@@ -26,6 +26,7 @@ enum FlutterPluginVersion {
   none,
   v1,
   v2,
+  managed,
 }
 
 bool isProjectUsingGradle() {
@@ -34,14 +35,22 @@ bool isProjectUsingGradle() {
 
 FlutterPluginVersion get flutterPluginVersion {
   File plugin = fs.file('android/buildSrc/src/main/groovy/FlutterPlugin.groovy');
-  if (!plugin.existsSync()) {
-    return FlutterPluginVersion.none;
+  if (plugin.existsSync()) {
+    String packageLine = plugin.readAsLinesSync().skip(4).first;
+    if (packageLine == "package io.flutter.gradle") {
+      return FlutterPluginVersion.v2;
+    }
+    return FlutterPluginVersion.v1;
   }
-  String packageLine = plugin.readAsLinesSync().skip(4).first;
-  if (packageLine == "package io.flutter.gradle") {
-    return FlutterPluginVersion.v2;
+  File appGradle = fs.file('android/app/build.gradle');
+  if (appGradle.existsSync()) {
+    for (String line in appGradle.readAsLinesSync()) {
+      if (line.contains(new RegExp(r"apply from: .*/flutter.gradle"))) {
+        return FlutterPluginVersion.managed;
+      }
+    }
   }
-  return FlutterPluginVersion.v1;
+  return FlutterPluginVersion.none;
 }
 
 String get gradleAppOut {
@@ -50,6 +59,8 @@ String get gradleAppOut {
       // Fall through. Pretend we're v1, and just go with it.
     case FlutterPluginVersion.v1:
       return gradleAppOutV1;
+    case FlutterPluginVersion.managed:
+      // Fall through. The managed plugin matches plugin v2 for now.
     case FlutterPluginVersion.v2:
       return gradleAppOutV2;
   }
@@ -197,6 +208,8 @@ Future<Null> buildGradleProject(BuildMode buildMode) async {
       // Fall through. Pretend it's v1, and just go for it.
     case FlutterPluginVersion.v1:
       return buildGradleProjectV1(gradlew);
+    case FlutterPluginVersion.managed:
+      // Fall through. Managed plugin builds the same way as plugin v2.
     case FlutterPluginVersion.v2:
       return buildGradleProjectV2(gradlew, buildModeName);
   }

packages/flutter_tools/templates/create/android.tmpl/.gitignore

+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+
+/gradle
+/gradlew
+/gradlew.bat

packages/flutter_tools/templates/create/android.tmpl/app/build.gradle

+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withInputStream { stream ->
+        localProperties.load(stream)
+    }
+}
+
+def flutterRoot = localProperties.getProperty('flutter.sdk')
+if (flutterRoot == null) {
+    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+}
+
+apply plugin: 'com.android.application'
+apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion '24.0.1'
+
+    lintOptions {
+        disable 'InvalidPackage'
+    }
+
+    defaultConfig {
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig signingConfigs.debug
+        }
+    }
+}
+
+flutter {
+    source '../..'
+}
+
+dependencies {
+    androidTestCompile 'com.android.support:support-annotations:25.0.0'
+    androidTestCompile 'com.android.support.test:runner:0.5'
+    androidTestCompile 'com.android.support.test:rules:0.5'
+}

packages/flutter_tools/templates/create/android/AndroidManifest.xml.tmpl → packages/flutter_tools/templates/create/android.tmpl/app/src/main/AndroidManifest.xml.tmpl

@@ -16,7 +16,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application android:name="io.flutter.app.FlutterApplication" android:label="{{projectName}}" android:icon="@mipmap/ic_launcher">
-        <activity android:name="io.flutter.app.FlutterActivity"
+        <activity android:name=".MainActivity"
                   android:launchMode="singleTop"
                   android:theme="@android:style/Theme.Black.NoTitleBar"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"

packages/flutter_tools/templates/create/android.tmpl/app/src/main/java/com/yourcompany/projectName/MainActivity.java.tmpl

+package {{androidIdentifier}};
+
+import android.os.Bundle;
+import io.flutter.app.FlutterActivity;
+
+public class MainActivity extends FlutterActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+}
+

packages/flutter_tools/templates/create/android.tmpl/build.gradle

+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.3'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.14.1'
+}

packages/flutter_tools/templates/create/android.tmpl/gradle.properties

+org.gradle.jvmargs=-Xmx1536M

packages/flutter_tools/templates/create/android.tmpl/settings.gradle

+include ':app'