From 4b674c77baba2f55ce1faf7ac29b3cd850a0b7e9 Mon Sep 17 00:00:00 2001
From: rishab2113 <rishab@bu.edu>
Date: Tue, 23 Apr 2019 12:26:56 -0400
Subject: [PATCH 1/2] updates to fix breaking changes introduced by
 firebase_ml_vision: 0.7.0

---
 ios/Podfile                | 2 +-
 lib/detector_painters.dart | 6 +++---
 lib/main.dart              | 8 ++++----
 pubspec.yaml               | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ios/Podfile b/ios/Podfile
index f23c8a5..c84fa0c 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '9.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/lib/detector_painters.dart b/lib/detector_painters.dart
index 5a24740..ab15e64 100644
--- a/lib/detector_painters.dart
+++ b/lib/detector_painters.dart
@@ -77,7 +77,7 @@ class LabelDetectorPainter extends CustomPainter {
   LabelDetectorPainter(this.imageSize, this.labels);
 
   final Size imageSize;
-  final List<Label> labels;
+  final List<ImageLabel> labels;
 
   @override
   void paint(Canvas canvas, Size size) {
@@ -89,8 +89,8 @@ class LabelDetectorPainter extends CustomPainter {
     );
 
     builder.pushStyle(ui.TextStyle(color: Colors.green));
-    for (Label label in labels) {
-      builder.addText('Label: ${label.label}, '
+    for (ImageLabel label in labels) {
+      builder.addText('Label: ${label.text}, '
           'Confidence: ${label.confidence.toStringAsFixed(2)}\n');
     }
     builder.pop();
diff --git a/lib/main.dart b/lib/main.dart
index 8b7757c..66b2900 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -75,9 +75,9 @@ class _MyHomePageState extends State<_MyHomePage> {
       case Detector.barcode:
         return mlVision.barcodeDetector().detectInImage;
       case Detector.label:
-        return mlVision.labelDetector().detectInImage;
+        return mlVision.imageLabeler().processImage;
       case Detector.cloudLabel:
-        return mlVision.cloudLabelDetector().detectInImage;
+        return mlVision.cloudImageLabeler().processImage;
       default:
         assert(_currentDetector == Detector.face);
         return mlVision.faceDetector().processImage;
@@ -110,11 +110,11 @@ class _MyHomePageState extends State<_MyHomePage> {
         painter = FaceDetectorPainter(imageSize, _scanResults);
         break;
       case Detector.label:
-        if (_scanResults is! List<Label>) return noResultsText;
+        if (_scanResults is! List<ImageLabel>) return noResultsText;
         painter = LabelDetectorPainter(imageSize, _scanResults);
         break;
       case Detector.cloudLabel:
-        if (_scanResults is! List<Label>) return noResultsText;
+        if (_scanResults is! List<ImageLabel>) return noResultsText;
         painter = LabelDetectorPainter(imageSize, _scanResults);
         break;
       default:
diff --git a/pubspec.yaml b/pubspec.yaml
index a9bc9f4..9dd5bad 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
     sdk: flutter
 
   cupertino_icons: ^0.1.2
-  firebase_ml_vision: ^0.6.0
+  firebase_ml_vision: ^0.7.0
   camera: ^0.4.2
 
 dev_dependencies:

From 978d7cc39b0afd11204533cda74f9223789f58d6 Mon Sep 17 00:00:00 2001
From: rishab2113 <rishab@bu.edu>
Date: Sat, 1 Jun 2019 15:41:00 -0400
Subject: [PATCH 2/2] update

---
 android/app/build.gradle                         | 12 ++++++------
 android/build.gradle                             |  2 +-
 android/gradle.properties                        |  2 ++
 android/gradle/wrapper/gradle-wrapper.properties |  4 ++--
 pubspec.yaml                                     |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 32198e3..f11f864 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'com.google.gms.google-services'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -36,10 +36,10 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.mlkitdemo"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -51,7 +51,7 @@ android {
     }
 
     dependencies {
-        api 'com.google.firebase:firebase-ml-vision-image-label-model:16.2.0'
+        api 'com.google.firebase:firebase-ml-vision-image-label-model:17.0.2'
     }
 }
 
@@ -61,7 +61,7 @@ flutter {
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     implementation 'com.google.firebase:firebase-core:16.0.4'
 }
diff --git a/android/build.gradle b/android/build.gradle
index ea9a5cd..c19dd65 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.google.gms:google-services:4.1.0'
     }
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 8bd86f6..53ae0ae 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1 +1,3 @@
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index bae5290..9f62566 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Fri May 31 11:19:07 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/pubspec.yaml b/pubspec.yaml
index 9dd5bad..4b7339c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
     sdk: flutter
 
   cupertino_icons: ^0.1.2
-  firebase_ml_vision: ^0.7.0
+  firebase_ml_vision: ^0.8.0
   camera: ^0.4.2
 
 dev_dependencies: