diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ce1438a0..349a8e7b 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -17,10 +17,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Setup java uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Run ktlintCheck run: ./gradlew ktlintCheck @@ -30,9 +30,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Setup java uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Build debug sample app run: ./gradlew :activity-sample:assembleBundledDebug :advanced-sample:assembleBundledDebug :fragment-sample:assembleBundledDebug \ No newline at end of file diff --git a/README.md b/README.md index 399a79e4..8a4d8995 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,10 @@ There are two different flavors available on `jcenter()`: | V2 barcode model is used (possibly faster, more accurate) | currently V1 will be downloaded ```kotlin // bundled: -implementation("com.g00fy2.quickie:quickie-bundled:0.2.0") +implementation("com.g00fy2.quickie:quickie-bundled:0.3.0") // unbundled: -implementation("com.g00fy2.quickie:quickie-unbundled:0.2.0") +implementation("com.g00fy2.quickie:quickie-unbundled:0.3.0") ``` ## Quick Start diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt index 7a1a6457..fb6354ac 100644 --- a/buildSrc/src/main/kotlin/Config.kt +++ b/buildSrc/src/main/kotlin/Config.kt @@ -8,5 +8,5 @@ object Config { const val androidCompileSdkVersion = 30 const val androidTargetSdkVersion = androidCompileSdkVersion - const val buildToolsVersion = "30.0.2" + const val buildToolsVersion = "30.0.3" } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index a3e56830..cc49d4d7 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { const val androidGradle = "4.1.1" - const val kotlin = "1.4.20" + const val kotlin = "1.4.21" const val ktlintPlugin = "9.4.1" const val ktlint = "0.40.0" @@ -21,6 +21,6 @@ object Versions { const val materialDesign = "1.2.1" - const val barcodeScanning = "16.0.3" - const val barcodeScanningGms = "16.1.2" + const val barcodeScanning = "16.1.0" + const val barcodeScanningGms = "16.1.3" } \ No newline at end of file diff --git a/quickie/build.gradle.kts b/quickie/build.gradle.kts index 83f2bdc0..bd0c54cd 100644 --- a/quickie/build.gradle.kts +++ b/quickie/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { } group = "com.g00fy2.quickie" -version = "0.2.0" +version = "0.3.0" tasks.register("androidJavadocJar") { archiveClassifier.set("javadoc") @@ -70,8 +70,8 @@ tasks.withType { afterEvaluate { publishing { - // publishBundledReleasePublicationToBintrayQuickieBundledRepository -Pbintray_user=name -Pbintray_key=key publications { + // publishBundledReleasePublicationToBintrayQuickieBundledRepository -Pbintray_user=name -Pbintray_key=key create("bundledRelease") { from(components["bundledRelease"]) val libraryName = "quickie-bundled"