From 75703cc0ef9fbc6a8182f3531599885c14f17a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kurt=20Inge=20Sma=CC=8Adal?= <kurtinge@gmail.com>
Date: Wed, 30 Mar 2022 21:59:49 +0200
Subject: [PATCH] Updated to latest version of flutter

---
 datawedge_flutter/android/app/build.gradle    |  4 ++--
 .../android/app/src/main/AndroidManifest.xml  |  3 ++-
 .../datawedgeflutter/MainActivity.kt          |  2 +-
 datawedge_flutter/android/build.gradle        |  4 ++--
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 datawedge_flutter/pubspec.lock                | 23 ++++++++++++-------
 datawedge_flutter/pubspec.yaml                |  2 +-
 7 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/datawedge_flutter/android/app/build.gradle b/datawedge_flutter/android/app/build.gradle
index f7c4535..3a6aa8f 100644
--- a/datawedge_flutter/android/app/build.gradle
+++ b/datawedge_flutter/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+     compileSdkVersion flutter.compileSdkVersion
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -39,7 +39,7 @@ android {
     defaultConfig {
         applicationId "com.darryncampbell.datawedgeflutter"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/datawedge_flutter/android/app/src/main/AndroidManifest.xml b/datawedge_flutter/android/app/src/main/AndroidManifest.xml
index b6f3e84..cb575bb 100644
--- a/datawedge_flutter/android/app/src/main/AndroidManifest.xml
+++ b/datawedge_flutter/android/app/src/main/AndroidManifest.xml
@@ -6,10 +6,11 @@
          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="datawedgeflutter"
         android:icon="@mipmap/ic_launcher">
         <activity
+            android:exported="true"
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
diff --git a/datawedge_flutter/android/app/src/main/kotlin/com/darryncampbell/datawedgeflutter/MainActivity.kt b/datawedge_flutter/android/app/src/main/kotlin/com/darryncampbell/datawedgeflutter/MainActivity.kt
index 2fdbbb5..352fc42 100644
--- a/datawedge_flutter/android/app/src/main/kotlin/com/darryncampbell/datawedgeflutter/MainActivity.kt
+++ b/datawedge_flutter/android/app/src/main/kotlin/com/darryncampbell/datawedgeflutter/MainActivity.kt
@@ -76,7 +76,7 @@ class MainActivity: FlutterActivity() {
                     var date = Calendar.getInstance().getTime()
                     var df = SimpleDateFormat("dd/MM/yyyy HH:mm:ss")
                     var dateTimeString = df.format(date)
-                    var currentScan = Scan(scanData, symbology, dateTimeString);
+                    var currentScan = Scan(scanData.toString(), symbology.toString(), dateTimeString.toString());
                     events?.success(currentScan.toJson())
                 }
                 //  Could handle return values from DW here such as RETURN_GET_ACTIVE_PROFILE
diff --git a/datawedge_flutter/android/build.gradle b/datawedge_flutter/android/build.gradle
index 3100ad2..f132e37 100644
--- a/datawedge_flutter/android/build.gradle
+++ b/datawedge_flutter/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/datawedge_flutter/android/gradle/wrapper/gradle-wrapper.properties b/datawedge_flutter/android/gradle/wrapper/gradle-wrapper.properties
index 296b146..bc6a58a 100644
--- a/datawedge_flutter/android/gradle/wrapper/gradle-wrapper.properties
+++ b/datawedge_flutter/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.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/datawedge_flutter/pubspec.lock b/datawedge_flutter/pubspec.lock
index 7ffced4..a1d69ee 100644
--- a/datawedge_flutter/pubspec.lock
+++ b/datawedge_flutter/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,14 +21,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -73,14 +73,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
@@ -134,7 +141,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
@@ -148,6 +155,6 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.15.1 <3.0.0"
diff --git a/datawedge_flutter/pubspec.yaml b/datawedge_flutter/pubspec.yaml
index 11fc3ac..d325caa 100644
--- a/datawedge_flutter/pubspec.yaml
+++ b/datawedge_flutter/pubspec.yaml
@@ -14,7 +14,7 @@ description: Accessing DataWedge from a Flutter app
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.15.1 <3.0.0"
 
 dependencies:
   flutter: