diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cb3473..3df1299 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [1.0.0] - 8/30/18 + +Breaking Change: Adds support for AndroidX + ## [0.0.8] - 8/30/18 * Fixes [iOS: pressing cancel doesn't stop scanning](https://github.com/apptreesoftware/flutter_barcode_reader/issues/60) thanks to @tgezginis. diff --git a/android/build.gradle b/android/build.gradle index 2ac74d6..1ac4e7c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,11 +3,8 @@ version '1.0-SNAPSHOT' buildscript { repositories { - jcenter() - maven { - url "https://maven.google.com" - } google() + jcenter() } dependencies { @@ -19,9 +16,6 @@ buildscript { rootProject.allprojects { repositories { jcenter() - maven { - url "https://maven.google.com" - } google() } } @@ -49,7 +43,7 @@ android { dependencies { implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.51' - implementation 'me.dm7.barcodescanner:zxing:1.9.8' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20' + implementation 'me.dm7.barcodescanner:zxing:1.9.13' api 'com.google.android.material:material:1.0.0' } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 7d69f98..f00068b 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-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/barcode_scan.iml b/barcode_scan.iml index 9331652..73e7ebd 100644 --- a/barcode_scan.iml +++ b/barcode_scan.iml @@ -1,12 +1,14 @@ - + + + diff --git a/pubspec.yaml b/pubspec.yaml index 59019f5..5cb50ce 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: barcode_scan description: A flutter plugin for scanning 2D barcodes and QRCodes. -version: 0.0.8 +version: 1.0.0 author: Matthew Smith homepage: https://github.com/apptreesoftware/flutter_barcode_reader