Flutter beta (#1952)

platform_channels/.metadata

@@ -1,11 +1,11 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.
 
 version:
-  revision: f732038a8cf4562ce38a1d7debb30209ae3da896
-  channel: beta
+  revision: "ac71592bc605996f9376ec5b7607db52b64cabd0"
+  channel: "beta"
 
 project_type: app
 
@@ -13,14 +13,14 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
-      base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
+      create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
+      base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
     - platform: android
-      create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
-      base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
+      create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
+      base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
     - platform: ios
-      create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
-      base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
+      create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
+      base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0
 
   # User provided section
 

platform_channels/android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-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.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,11 +22,8 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
+    namespace "dev.flutter.platform_channels"
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
@@ -67,6 +65,5 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.google.code.gson:gson:2.8.6'
 }

platform_channels/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.platform_channels">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

platform_channels/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.platform_channels">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:label="platform_channels"
         android:name="${applicationName}"

platform_channels/android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.platform_channels">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

platform_channels/android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

platform_channels/android/settings.gradle

@@ -1,15 +1,20 @@
-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-include ':app'
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    plugins {
+        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
+    }
+}
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+include ":app"
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"

platform_channels/codelab_rebuild.yaml

@@ -10,30 +10,19 @@ steps:
   - name: Strip DEVELOPMENT_TEAM
     strip-lines-containing: DEVELOPMENT_TEAM =
     path: ios/Runner.xcodeproj/project.pbxproj
-  - name: Patch android/settings.gradle
-    path: android/settings.gradle
-    patch-u: |
-      --- b/platform_channels/android/settings.gradle
-      +++ a/platform_channels/android/settings.gradle
-      @@ -1,3 +1,7 @@
-      +// Copyright 2014 The Flutter Authors. All rights reserved.
-      +// Use of this source code is governed by a BSD-style license that can be
-      +// found in the LICENSE file.
-      +
-       include ':app'
-       
-       def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
   - name: Patch android/app/build.gradle
     path: android/app/build.gradle
     patch-u: |
       --- b/platform_channels/android/app/build.gradle
       +++ a/platform_channels/android/app/build.gradle
-      @@ -68,4 +68,5 @@ flutter {
-       
-       dependencies {
-           implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-      +    implementation 'com.google.code.gson:gson:2.8.6'
+      @@ -64,4 +64,6 @@ flutter {
+           source '../..'
        }
+       
+      -dependencies {}
+      +dependencies {
+      +    implementation 'com.google.code.gson:gson:2.8.6'
+      +}
   - name: Mkdir ios/Runner/Assets.xcassets/eat_new_orleans.imageset
     mkdir: ios/Runner/Assets.xcassets/eat_new_orleans.imageset
   - name: Add ios/Runner/Assets.xcassets/eat_new_orleans.imageset/Contents.json

platform_channels/ios/Runner.xcodeproj/project.pbxproj

@@ -170,7 +170,8 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C8080294A63A400263BE5 = {

platform_channels/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

platform_channels/ios/Runner/Info.plist

@@ -41,8 +41,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>

platform_channels/pubspec.yaml

@@ -4,7 +4,7 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.1.0-0
 
 dependencies:
   flutter: