From e87e47ca218ff2bd92ceeba4e46e2c19900f9ef8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 May 2022 05:22:17 +0000 Subject: [PATCH] Bump daggerVersion from 2.41 to 2.42 Bumps `daggerVersion` from 2.41 to 2.42. Updates `dagger` from 2.41 to 2.42 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.41...dagger-2.42) Updates `dagger-compiler` from 2.41 to 2.42 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.41...dagger-2.42) --- updated-dependencies: - dependency-name: com.google.dagger:dagger dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:dagger-compiler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- uhabits-android/build.gradle.kts | 42 +++++++++++++++----------------- uhabits-core/build.gradle.kts | 14 +++++------ 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts index 65e4c1507..3ff117a58 100644 --- a/uhabits-android/build.gradle.kts +++ b/uhabits-android/build.gradle.kts @@ -1,5 +1,3 @@ - - /* * Copyright (C) 2016-2021 Álinson Santos Xavier * @@ -20,7 +18,7 @@ */ plugins { - id("com.github.triplet.play") version "3.5.0" + id("com.github.triplet.play") version "3.7.0" id("com.android.application") id("org.jetbrains.kotlin.android") id("org.jetbrains.kotlin.kapt") @@ -34,15 +32,15 @@ tasks.compileLint { android { - compileSdkVersion(30) + compileSdk = 31 defaultConfig { - versionCode(20003) - versionName("2.0.3") - minSdkVersion(23) - targetSdkVersion(30) - applicationId("org.isoron.uhabits") - testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner") + versionCode = 20003 + versionName = "2.0.3" + minSdk = 23 + targetSdk = 31 + applicationId = "org.isoron.uhabits" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } signingConfigs { @@ -58,7 +56,7 @@ android { buildTypes { getByName("release") { - minifyEnabled(true) + isMinifyEnabled = true proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt") if (signingConfigs.findByName("release") != null) { signingConfig = signingConfigs.getByName("release") @@ -70,7 +68,7 @@ android { } } - lintOptions { + lint { isCheckReleaseBuilds = false isAbortOnError = false disable("GoogleAppIndexingWarning") @@ -88,10 +86,10 @@ android { } dependencies { - val daggerVersion = "2.38.1" - val kotlinVersion = "1.5.21" - val kxCoroutinesVersion = "1.5.1" - val ktorVersion = "1.6.2" + val daggerVersion = "2.42" + val kotlinVersion = "1.6.21" + val kxCoroutinesVersion = "1.6.1" + val ktorVersion = "1.6.8" val espressoVersion = "3.4.0" androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion") @@ -100,17 +98,17 @@ dependencies { androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.1") androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion") androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion") - androidTestImplementation("androidx.annotation:annotation:1.2.0") + androidTestImplementation("androidx.annotation:annotation:1.3.0") androidTestImplementation("androidx.test.ext:junit:1.1.3") androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0") androidTestImplementation("androidx.test:rules:1.4.0") androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") compileOnly("javax.annotation:jsr250-api:1.0") coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5") - implementation("com.github.paolorotolo:appintro:4.1.0") + implementation("com.github.AppIntro:AppIntro:6.2.0") implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.google.dagger:dagger:$daggerVersion") - implementation("com.google.guava:guava:30.1.1-android") + implementation("com.google.guava:guava:31.1-android") implementation("io.ktor:ktor-client-android:$ktorVersion") implementation("io.ktor:ktor-client-core:$ktorVersion") implementation("io.ktor:ktor-client-jackson:$ktorVersion") @@ -118,11 +116,11 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kxCoroutinesVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kxCoroutinesVersion") - implementation("androidx.appcompat:appcompat:1.3.1") + implementation("androidx.appcompat:appcompat:1.4.1") implementation("androidx.legacy:legacy-preference-v14:1.0.0") implementation("androidx.legacy:legacy-support-v4:1.0.0") - implementation("com.google.android.material:material:1.4.0") - implementation("com.opencsv:opencsv:5.5.1") + implementation("com.google.android.material:material:1.5.0") + implementation("com.opencsv:opencsv:5.6") implementation(project(":uhabits-core")) kapt("com.google.dagger:dagger-compiler:$daggerVersion") kaptAndroidTest("com.google.dagger:dagger-compiler:$daggerVersion") diff --git a/uhabits-core/build.gradle.kts b/uhabits-core/build.gradle.kts index c0ba0c064..5e8414446 100644 --- a/uhabits-core/build.gradle.kts +++ b/uhabits-core/build.gradle.kts @@ -43,13 +43,13 @@ kotlin { val jvmMain by getting { dependencies { implementation(kotlin("stdlib-jdk8")) - compileOnly("com.google.dagger:dagger:2.38.1") - implementation("com.google.guava:guava:30.1.1-android") - implementation("org.jetbrains.kotlin:kotlin-stdlib:1.5.30") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.1") - implementation("androidx.annotation:annotation:1.2.0") + compileOnly("com.google.dagger:dagger:2.42") + implementation("com.google.guava:guava:31.1-android") + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1") + implementation("androidx.annotation:annotation:1.3.0") implementation("com.google.code.findbugs:jsr305:3.0.2") - implementation("com.opencsv:opencsv:5.5.1") + implementation("com.opencsv:opencsv:5.6") implementation("commons-codec:commons-codec:1.15") implementation("org.apache.commons:commons-lang3:3.12.0") } @@ -59,7 +59,7 @@ kotlin { dependencies { implementation(kotlin("test")) implementation(kotlin("test-junit")) - implementation("org.xerial:sqlite-jdbc:3.36.0.1") + implementation("org.xerial:sqlite-jdbc:3.36.0.3") implementation("org.hamcrest:hamcrest:2.2") implementation("org.apache.commons:commons-io:1.3.2") implementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")