Merge branch 'release/1.3.3' into main

G00fY2 · Dec 20, 2021 · 100d0ae · 100d0ae
2 parents ee164c1 + 71c9076
commit 100d0ae
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@ There are two different flavors available on `mavenCentral()`:
 
 | Bundled                             | Unbundled                                         |
 | ----------------------------------- | ------------------------------------------------- |
-| ML Kit model is bundled inside app (independent of Google Services) | ML Kit model will be automatically downloaded via Play Services (once after app install) |
-| 2.2 MB app size increase per ABI (you should use App Bundle or ABI splitting) | 550 KB app size increase |
+| ML Kit model is bundled inside app (independent of Google Services) | ML Kit model will be automatically downloaded via Play Services (once while app install) |
+| 2.3 MB app size increase per ABI (you should use App Bundle or ABI splitting) | 550 KB app size increase |
 | V3 model is used (faster, more accurate) | currently V1 model will be downloaded
 ```kotlin
 // bundled:  

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,6 +1,6 @@
 object Versions {
 
-  const val quickie = "1.3.2"
+  const val quickie = "1.3.3"
 
   const val androidMinSdk = 21
   const val androidCompileSdk = 31
@@ -13,10 +13,10 @@ object Versions {
   const val appcompat = "1.4.0"
 
   const val cameraX = "1.0.2"
-  const val cameraView = "1.0.0-alpha31"
+  const val cameraView = "1.0.0-alpha32"
 
-  const val barcodeScanning = "17.0.0"
-  const val barcodeScanningGms = "16.2.1"
+  const val barcodeScanning = "17.0.1"
+  const val barcodeScanningGms = "17.0.0"
 
   const val materialDesign = "1.4.0"
 
@@ -33,4 +33,4 @@ object Versions {
     }
     return levels.size
   }
-}
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/quickie/src/main/kotlin/io/github/g00fy2/quickie/QRCodeAnalyzer.kt b/quickie/src/main/kotlin/io/github/g00fy2/quickie/QRCodeAnalyzer.kt
@@ -3,9 +3,9 @@ package io.github.g00fy2.quickie
 import androidx.camera.core.ExperimentalGetImage
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageProxy
-import com.google.mlkit.vision.barcode.Barcode
 import com.google.mlkit.vision.barcode.BarcodeScannerOptions
 import com.google.mlkit.vision.barcode.BarcodeScanning
+import com.google.mlkit.vision.barcode.common.Barcode
 import com.google.mlkit.vision.common.InputImage
 
 internal class QRCodeAnalyzer(

diff --git a/quickie/src/main/kotlin/io/github/g00fy2/quickie/QRScannerActivity.kt b/quickie/src/main/kotlin/io/github/g00fy2/quickie/QRScannerActivity.kt
@@ -22,7 +22,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 import io.github.g00fy2.quickie.config.ParcelableScannerConfig
 import io.github.g00fy2.quickie.databinding.QuickieScannerActivityBinding
 import io.github.g00fy2.quickie.extensions.toParcelableContentType

diff --git a/quickie/src/main/kotlin/io/github/g00fy2/quickie/config/BarcodeFormat.kt b/quickie/src/main/kotlin/io/github/g00fy2/quickie/config/BarcodeFormat.kt
@@ -1,6 +1,6 @@
 package io.github.g00fy2.quickie.config
 
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 
 /**
  * Wrapper class to access the ML Kit BarcodeFormat constants.

diff --git a/quickie/src/main/kotlin/io/github/g00fy2/quickie/extensions/BarcodeExtensions.kt b/quickie/src/main/kotlin/io/github/g00fy2/quickie/extensions/BarcodeExtensions.kt
@@ -1,7 +1,7 @@
 package io.github.g00fy2.quickie.extensions
 
 import android.os.Parcelable
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 import io.github.g00fy2.quickie.content.AddressParcelable
 import io.github.g00fy2.quickie.content.CalendarDateTimeParcelable
 import io.github.g00fy2.quickie.content.CalendarEventParcelable

diff --git a/quickie/src/main/kotlin/io/github/g00fy2/quickie/extensions/IntentExtensions.kt b/quickie/src/main/kotlin/io/github/g00fy2/quickie/extensions/IntentExtensions.kt
@@ -1,7 +1,7 @@
 package io.github.g00fy2.quickie.extensions
 
 import android.content.Intent
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 import io.github.g00fy2.quickie.QRScannerActivity
 import io.github.g00fy2.quickie.content.AddressParcelable
 import io.github.g00fy2.quickie.content.CalendarDateTimeParcelable

diff --git a/quickie/src/test/kotlin/io/github/g00fy2/quickie/BarcodeFormatsTest.kt b/quickie/src/test/kotlin/io/github/g00fy2/quickie/BarcodeFormatsTest.kt
@@ -1,6 +1,6 @@
 package io.github.g00fy2.quickie
 
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 import io.github.g00fy2.quickie.config.BarcodeFormat
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test