Merge branch 'release/1.4.1' into main

Author: G00fY2

.github/workflows/android.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Run detekt with ktlint
         run: ./gradlew detektBundledDebug detektUnbundledDebug
 
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Run bundled and unbundled unit tests
         run: ./gradlew test
 
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build debug bundled sample app
         run: ./gradlew :sample:assembleBundledDebug
 
@@ -43,6 +43,6 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build debug unbundled sample app
         run: ./gradlew :sample:assembleUnbundledDebug

README.md

@@ -18,10 +18,10 @@ There are two different flavors available on `mavenCentral()`:
 | V3 model is used (faster, more accurate) | currently V1 model will be downloaded
 ```kotlin
 // bundled:  
-implementation("io.github.g00fy2.quickie:quickie-bundled:1.4.0")
+implementation("io.github.g00fy2.quickie:quickie-bundled:1.4.1")
 
 // unbundled:
-implementation("io.github.g00fy2.quickie:quickie-unbundled:1.4.0")
+implementation("io.github.g00fy2.quickie:quickie-unbundled:1.4.1")
 ```
 
 ## Quick Start

build.gradle.kts

@@ -3,23 +3,24 @@ import io.gitlab.arturbosch.detekt.Detekt
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-  id(Plugins.Android.application) version Versions.androidGradle apply false
-  kotlin(Plugins.Kotlin.androidGradle) version Versions.kotlin apply false
-  id(Plugins.Misc.detekt) version Versions.detekt apply false
-  id(Plugins.Misc.gradleVersions) version Versions.gradleVersions
+  alias(libs.plugins.android.application) apply false
+  alias(libs.plugins.kotlin.androidGradle) apply false
+  alias(libs.plugins.misc.detekt) apply false
+  alias(libs.plugins.misc.gradleVersions)
 }
 
 subprojects {
-  apply(plugin = Plugins.Misc.detekt)
+  apply(plugin = rootProject.libs.plugins.misc.detekt.get().pluginId)
   extensions.configure<DetektExtension> {
-    toolVersion = Versions.detekt
+    toolVersion = rootProject.libs.versions.detekt.get()
     config = files("$rootDir/detekt.yml")
     buildUponDefaultConfig = true
     ignoredBuildTypes = listOf("release")
   }
   dependencies {
-    "detektPlugins"(Plugins.Misc.detektFormatting)
+    add("detektPlugins", rootProject.libs.misc.detektFormatting)
   }
   tasks.withType<Detekt>().configureEach {
     jvmTarget = "1.8"
@@ -36,6 +37,12 @@ subprojects {
   }
   afterEvaluate {
     extensions.configure<BaseExtension> {
+      compileSdkVersion(libs.versions.androidconfig.compileSdk.get().toInt())
+      buildToolsVersion(libs.versions.androidconfig.buildTools.get())
+      defaultConfig {
+        minSdk = libs.versions.androidconfig.minSdk.get().toInt()
+        targetSdk = libs.versions.androidconfig.targetSdk.get().toInt()
+      }
       compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -46,7 +53,14 @@ subprojects {
 
 tasks.dependencyUpdates.configure {
   gradleReleaseChannel = "current"
-  rejectVersionIf { Versions.maturityLevel(candidate.version) < Versions.maturityLevel(currentVersion) }
+
+  fun releaseType(version: String): Int {
+    val qualifiers = listOf("alpha", "beta", "m", "rc")
+    val index = qualifiers.indexOfFirst { version.matches(".*[.\\-]$it[.\\-\\d]*".toRegex(RegexOption.IGNORE_CASE)) }
+    return if (index < 0) qualifiers.size else index
+  }
+
+  rejectVersionIf { releaseType(candidate.version) < releaseType(currentVersion) }
 }
 
 tasks.register<Delete>("clean") {

buildSrc/build.gradle.kts

@@ -0,0 +1,54 @@
+[versions]
+quickie = "1.4.1"
+
+androidconfig-minSdk = "21"
+androidconfig-compileSdk = "31"
+androidconfig-targetSdk = "31"
+androidconfig-buildTools = "31.0.0"
+
+androidGradle = "7.1.2"
+kotlin = "1.6.20"
+
+appcompat = "1.4.1"
+
+cameraX = "1.0.2"
+cameraView = "1.0.0-alpha32"
+
+barcodeScanning = "17.0.2"
+barcodeScanningGms = "18.0.0"
+
+materialDesign = "1.5.0"
+
+detekt = "1.19.0"
+gradleVersions = "0.42.0"
+dokka = "1.6.10"
+
+junit = "5.8.2"
+
+[libraries]
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-camera = { module = "androidx.camera:camera-camera2", version.ref = "cameraX" }
+androidx-cameraLifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "cameraX" }
+androidx-cameraPreview = { module = "androidx.camera:camera-view", version.ref = "cameraView" }
+
+mlkit-barcodeScanning = { module = "com.google.mlkit:barcode-scanning", version.ref = "barcodeScanning" }
+mlkit-barcodeScanningGms = { module = "com.google.android.gms:play-services-mlkit-barcode-scanning", version.ref = "barcodeScanningGms" }
+
+google-materialDesign = { module = "com.google.android.material:material", version.ref = "materialDesign" }
+
+test-junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
+test-junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
+
+misc-detektFormatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradle" }
+android-library = { id = "com.android.library", version.ref = "androidGradle" }
+
+kotlin-androidGradle = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-android = { id = "kotlin-android", version.ref = "kotlin" }
+kotlin-parcelize = { id = "kotlin-parcelize", version.ref = "kotlin" }
+kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+
+misc-detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
+misc-gradleVersions = { id = "com.github.ben-manes.versions", version.ref = "gradleVersions" }

buildSrc/src/main/kotlin/Deps.kt

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists