From cbaa381d8e14077acc25156add228e622555535f Mon Sep 17 00:00:00 2001
From: Hennik Hunsaker <hennik@insidiouslogic.systems>
Date: Mon, 6 Dec 2021 09:55:54 -0700
Subject: [PATCH] Fix automated testing

---
 .github/workflows/main.yml                      |  7 ++-----
 README.md                                       |  8 ++++----
 .../android/app/src/main/AndroidManifest.xml    | 17 ++++-------------
 .../MainActivity.java                           |  9 +--------
 example/lib/main.dart                           |  1 -
 5 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 20b58e0..1050222 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,8 +14,5 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - run: sudo chown -R cirrus:cirrus ./ /github/home/
-    - name: Flutter pub get
-      run: flutter packages get
-    - name: Flutter analyze --suppress-analytics
-      run: flutter analyze --suppress-analytics
+    - run: flutter pub get
+    - run: flutter analyze --suppress-analytics
diff --git a/README.md b/README.md
index a92bf7c..825bec3 100644
--- a/README.md
+++ b/README.md
@@ -38,10 +38,10 @@ Or in text format add the key:
 If you're using one of the on-device APIs, include the corresponding ML Kit library model in your Podfile. Then run pod update in a terminal within the same directory as your Podfile.
 
 ```
-pod 'GoogleMLKit/BarcodeScanning'
-pod 'GoogleMLKit/FaceDetection'
-pod 'GoogleMLKit/ImageLabeling'
-pod 'GoogleMLKit/TextRecognition'
+pod 'GoogleMLKit/BarcodeScanning' '~> 2.2.0'
+pod 'GoogleMLKit/FaceDetection' '~> 2.2.0'
+pod 'GoogleMLKit/ImageLabeling' '~> 2.2.0'
+pod 'GoogleMLKit/TextRecognition' '~> 2.2.0'
 ```
 
 ### Android
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 67db473..7bf5387 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -2,13 +2,8 @@
     package="fr.rushioconsulting.flutter_camera_ml_vision_example"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
-         calls FlutterMain.startInitialization(this); in its onCreate method.
-         In most cases you can leave this as-is, but you if you want to provide
-         additional functionality it is fine to subclass or reimplement
-         FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="flutter_camera_ml_vision_example"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -18,18 +13,14 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <!-- This keeps the window background of the activity showing
-                 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" />
         <meta-data
             android:name="com.google.mlkit.vision.DEPENDENCIES"
             android:value="barcode" />
diff --git a/example/android/app/src/main/java/fr/rushioconsulting/flutter_camera_ml_vision_example/MainActivity.java b/example/android/app/src/main/java/fr/rushioconsulting/flutter_camera_ml_vision_example/MainActivity.java
index e5b5c04..8d75bb6 100644
--- a/example/android/app/src/main/java/fr/rushioconsulting/flutter_camera_ml_vision_example/MainActivity.java
+++ b/example/android/app/src/main/java/fr/rushioconsulting/flutter_camera_ml_vision_example/MainActivity.java
@@ -1,13 +1,6 @@
 package fr.rushioconsulting.flutter_camera_ml_vision_example;
 
-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);
-  }
 }
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 8c743f6..9005936 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -1,4 +1,3 @@
-import 'dart:developer';
 import 'dart:ui';
 
 import 'package:google_ml_kit/google_ml_kit.dart';