From 648bbc2b2411b42d1cd4d7ac0ee1d3acce87d115 Mon Sep 17 00:00:00 2001
From: "S. Peter Choe" <dokkaebi@gmail.com>
Date: Wed, 27 Jan 2021 22:54:36 +0900
Subject: [PATCH 1/2] Migrate to Android embedding v2

---
 android/app/src/main/AndroidManifest.xml                 | 7 +++----
 .../main/java/co/appbrewery/xylophone/MainActivity.java  | 9 +--------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index f13043c7..cef4539c 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -13,7 +13,6 @@
          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="xylophone"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -27,13 +26,13 @@
                  until Flutter renders its first frame. It can be removed if
                  there is no splash screen (such as the default splash screen
                  defined in @style/LaunchTheme). -->
-            <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>
diff --git a/android/app/src/main/java/co/appbrewery/xylophone/MainActivity.java b/android/app/src/main/java/co/appbrewery/xylophone/MainActivity.java
index 1eb91dc7..cf32f452 100644
--- a/android/app/src/main/java/co/appbrewery/xylophone/MainActivity.java
+++ b/android/app/src/main/java/co/appbrewery/xylophone/MainActivity.java
@@ -1,13 +1,6 @@
 package co.appbrewery.xylophone;
 
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.embedding.android.FlutterActivity;
 
 public class MainActivity extends FlutterActivity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    GeneratedPluginRegistrant.registerWith(this);
-  }
 }

From d3e84206a944d7291a9fcda1a1c312eed97758b7 Mon Sep 17 00:00:00 2001
From: "S. Peter Choe" <dokkaebi@gmail.com>
Date: Wed, 27 Jan 2021 23:01:15 +0900
Subject: [PATCH 2/2] Upgrade gradle version

---
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 63ab3ae0..dfbc8f4f 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip