From 4de914d2ecc3c6b7d1ed7f58939341a1321cb334 Mon Sep 17 00:00:00 2001 From: juliansteenbakker Date: Tue, 16 Nov 2021 20:13:39 +0100 Subject: [PATCH 1/6] imp: upgrade core dependencies --- android/build.gradle | 8 ++++---- example/android/build.gradle | 2 +- example/android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index cd4c6f9..85dbfd3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.0.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -48,8 +48,8 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation('com.journeyapps:zxing-android-embedded:4.2.0') { transitive = false } - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'com.google.zxing:core:3.3.3' + implementation('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false } + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'com.google.zxing:core:3.4.1' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' } diff --git a/example/android/build.gradle b/example/android/build.gradle index 40b343e..3d8f62a 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.0.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 7083094..0ae5687 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Oct 08 10:14:36 CEST 2021 +#Tue Nov 16 20:02:48 CET 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 2e9a3ced7a8de61f2055233d2a322ad8ef7eb3c1 Mon Sep 17 00:00:00 2001 From: juliansteenbakker Date: Tue, 16 Nov 2021 20:16:21 +0100 Subject: [PATCH 2/6] imp: upgrade compileSdkVersion of plugin --- android/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 85dbfd3..78dba60 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -33,6 +33,7 @@ android { defaultConfig { // minSdkVersion is determined by Native View. minSdkVersion 20 + targetSdkVersion 31 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true } From 5fd11537f72c31679760784189bc5f6f8fac2bc0 Mon Sep 17 00:00:00 2001 From: juliansteenbakker Date: Tue, 16 Nov 2021 20:18:14 +0100 Subject: [PATCH 3/6] imp: fix error on older devices --- .../src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt b/android/src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt index 3578f44..ee27aa7 100644 --- a/android/src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt +++ b/android/src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt @@ -293,7 +293,9 @@ class QRView(private val context: Context, messenger: BinaryMessenger, private v } } else -> { - result?.error("cameraPermission", "Platform Version to low for camera permission check", null) + // We should have permissions on older OS versions + permissionGranted = true + channel.invokeMethod("onPermissionSet", true) } } } From b0dd8312f4acfe9cacced792096bc9aca50819e7 Mon Sep 17 00:00:00 2001 From: juliansteenbakker Date: Tue, 16 Nov 2021 20:19:08 +0100 Subject: [PATCH 4/6] style: remove white space --- android/src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/android/src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt b/android/src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt index ee27aa7..dc03065 100644 --- a/android/src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt +++ b/android/src/main/kotlin/net/touchcapture/qr/flutterqr/QRView.kt @@ -117,8 +117,6 @@ class QRView(private val context: Context, messenger: BinaryMessenger, private v barcodeView!!.resume() result.success(settings.requestedCameraId) } - - } private fun getFlashInfo(result: MethodChannel.Result) { From b163cc92491591f3c9c7e6ee67b2104ce8a6ad47 Mon Sep 17 00:00:00 2001 From: juliansteenbakker Date: Tue, 16 Nov 2021 20:22:07 +0100 Subject: [PATCH 5/6] imp: add changelog entry --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c331a5a..eb135ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.2 +* Fixed permission error on devices running Android 7 or lower. +* Updated dependencies + ## 0.6.1 * Fix bug which caused build to fail for iOS. (#452) From 1f9f1752b3f8d38fc2379df3825e9ad26f216a59 Mon Sep 17 00:00:00 2001 From: juliansteenbakker Date: Tue, 16 Nov 2021 20:22:20 +0100 Subject: [PATCH 6/6] imp: bump version --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 017bb95..67379b9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: qr_code_scanner description: QR code scanner that can be embedded inside flutter. It uses zxing in Android and MTBBarcode scanner in iOS. -version: 0.6.1 +version: 0.6.2 homepage: https://juliuscanute.com repository: https://github.com/juliuscanute/qr_code_scanner