From d806560cd5226148488a55dcd36ff06f5e82b8b1 Mon Sep 17 00:00:00 2001
From: weilu <a05111993@163.com>
Date: Fri, 20 Dec 2019 15:18:16 +0800
Subject: [PATCH] flutter sdk 1.12.13

---
 android/build.gradle                                  |  4 ++--
 example/.gitignore                                    |  1 +
 example/android/build.gradle                          |  4 ++--
 example/android/gradle.properties                     |  3 +++
 .../android/gradle/wrapper/gradle-wrapper.properties  |  2 +-
 example/ios/Flutter/flutter_export_environment.sh     | 10 ++++++++++
 pubspec.yaml                                          | 11 ++++++++---
 7 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 example/ios/Flutter/flutter_export_environment.sh

diff --git a/android/build.gradle b/android/build.gradle
index bfc5dab..dcf3fef 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
     }
 }
@@ -44,5 +44,5 @@ android {
 dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41'
     implementation 'me.dm7.barcodescanner:zxing:1.9.13'
-    implementation 'androidx.core:core:1.0.0'
+    implementation 'androidx.core:core:1.0.2'
 }
diff --git a/example/.gitignore b/example/.gitignore
index eb15c3d..1624781 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -8,3 +8,4 @@ ios/.generated/
 packages
 pubspec.lock
 .flutter-plugins
+.flutter-plugins-dependencies
diff --git a/example/android/build.gradle b/example/android/build.gradle
index b8ccfd0..73d9cc7 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.20'
+    ext.kotlin_version = '1.3.41'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index 8bd86f6..5c8fc89 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 2819f02..9b6616c 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/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-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
new file mode 100644
index 0000000..fe89464
--- /dev/null
+++ b/example/ios/Flutter/flutter_export_environment.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=E:\flutter"
+export "FLUTTER_APPLICATION_PATH=D:\flutter\flutter_barcode_reader\example"
+export "FLUTTER_TARGET=lib\main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build\ios"
+export "FLUTTER_FRAMEWORK_DIR=E:\flutter\bin\cache\artifacts\engine\ios"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"
diff --git a/pubspec.yaml b/pubspec.yaml
index 5cb50ce..c3cc534 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,15 +10,20 @@ dependencies:
 
 environment:
   sdk: ">=2.0.0-dev.58.0 <3.0.0"
-
+  flutter: ">=1.10.0 <2.0.0"
+  
 # For information on the generic Dart part of this file, see the
 # following page: https://www.dartlang.org/tools/pub/pubspec
 
 # The following section is specific to Flutter.
 flutter:
   plugin:
-    androidPackage: com.apptreesoftware.barcodescan
-    pluginClass: BarcodeScanPlugin
+    platforms:
+      android:
+        package: com.apptreesoftware.barcodescan
+        pluginClass: BarcodeScanPlugin
+      ios:
+        pluginClass: BarcodeScanPlugin
 
   # To add assets to your plugin package, add an assets section, like this:
   # assets: