Merge branch 'release/1.7.0'

README.md

@@ -21,10 +21,10 @@ There are two different flavors available on `mavenCentral()`:
 
 ```kotlin
 // bundled:  
-implementation("io.github.g00fy2.quickie:quickie-bundled:1.6.0")
+implementation("io.github.g00fy2.quickie:quickie-bundled:1.7.0")
 
 // unbundled:
-implementation("io.github.g00fy2.quickie:quickie-unbundled:1.6.0")
+implementation("io.github.g00fy2.quickie:quickie-unbundled:1.7.0")
 ```
 
 ## Quick Start

build.gradle.kts

@@ -2,9 +2,9 @@ import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.BasePlugin
 import io.gitlab.arturbosch.detekt.Detekt
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
   alias(libs.plugins.android.application) apply false
   alias(libs.plugins.android.library) apply false
@@ -30,13 +30,15 @@ subprojects {
     jvmTarget = "11"
   }
   tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-      allWarningsAsErrors = true
-      freeCompilerArgs = freeCompilerArgs + listOfNotNull(
-        "-progressive",
-        "-Xexplicit-api=strict".takeIf { (this@subprojects.name != "sample") },
+    compilerOptions {
+      allWarningsAsErrors.set(true)
+      freeCompilerArgs.addAll(
+        listOfNotNull(
+          "-progressive",
+          "-Xexplicit-api=strict".takeIf { (this@subprojects.name != "sample") },
+        )
       )
-      jvmTarget = JavaVersion.VERSION_11.toString()
+      jvmTarget.set(JvmTarget.JVM_11)
     }
   }
   plugins.withType<BasePlugin>().configureEach {

gradle.properties

@@ -4,9 +4,4 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
 # Controls whether Gradle should print a welcome message
 org.gradle.welcome=never
 # Allow usage of AndroidX instead of the old support libraries.
-android.useAndroidX=true
-# Use R8 in full mode instead of ProGuard compatibility mode.
-android.enableR8.fullMode=true
-# Enables namespacing of each library's R class so that its R class includes only the resources declared in the library
-# itself and none from the library's dependencies
-android.nonTransitiveRClass=true
+android.useAndroidX=true

gradle/libs.versions.toml

@@ -1,28 +1,28 @@
 [versions]
-quickie = "1.6.0"
+quickie = "1.7.0"
 
 androidconfig-minSdk = "21"
 androidconfig-compileSdk = "33"
 androidconfig-targetSdk = "33"
-androidconfig-buildTools = "33.0.1"
+androidconfig-buildTools = "33.0.2"
 
-androidGradle = "7.3.1"
-kotlin = "1.7.21"
+androidGradle = "8.0.1"
+kotlin = "1.8.21"
 
-appcompat = "1.5.1"
+appcompat = "1.6.1"
 
-cameraX = "1.2.0"
+cameraX = "1.2.2"
 
 barcodeScanning = "17.0.3"
 barcodeScanningGms = "18.1.0"
 
-materialDesign = "1.7.0"
+materialDesign = "1.9.0"
 
 detekt = "1.22.0"
-gradleVersions = "0.44.0"
-dokka = "1.7.20"
+gradleVersions = "0.46.0"
+dokka = "1.8.10"
 
-junit = "5.9.1"
+junit = "5.9.3"
 
 [libraries]
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -144,15 +141,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

quickie/build.gradle.kts

@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.kotlin.android)
@@ -13,7 +12,6 @@ android {
   resourcePrefix = "quickie"
   buildFeatures {
     viewBinding = true
-    buildConfig = false
   }
   flavorDimensions += "mlkit"
   productFlavors {
@@ -99,7 +97,7 @@ fun MavenPublication.commonConfig(flavor: String) {
   from(components["${flavor}Release"])
   artifactId = "quickie-$flavor"
   artifact(tasks.named("androidJavadocJar"))
-  artifact(tasks.named("android${flavor.capitalize()}SourcesJar"))
+  artifact(tasks.named("android${flavor.replaceFirstChar { it.titlecase() }}SourcesJar"))
   pom {
     name.set("quickie-$flavor")
     description.set("Android QR code scanning library")

sample/build.gradle.kts

@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
   alias(libs.plugins.android.application)
   alias(libs.plugins.kotlin.android)
@@ -32,6 +31,7 @@ android {
     create("unbundled").dimension = "mlkit"
   }
   buildFeatures {
+    buildConfig = true
     viewBinding = true
   }
 }

sample/src/main/kotlin/io/github/g00fy2/quickiesample/SampleApp.kt

@@ -2,7 +2,6 @@ package io.github.g00fy2.quickiesample
 
 import android.app.Application
 import android.os.StrictMode
-import androidx.viewbinding.BuildConfig
 
 class SampleApp : Application() {
 

sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>