From d26f3979cd7fd253f4f21a3dc0cb63e7fc353f7c Mon Sep 17 00:00:00 2001 From: davidoskky Date: Mon, 11 Sep 2023 20:48:01 +0200 Subject: [PATCH] Upgrade all dependencies --- androidApp/build.gradle.kts | 39 ++++++++++++++++++------------------- build.gradle.kts | 2 +- shared/build.gradle.kts | 4 ++-- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index f333042..91143a2 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -12,7 +12,7 @@ plugins { } fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String { - var result: String = ByteArrayOutputStream().use { outputStream -> + val result: String = ByteArrayOutputStream().use { outputStream -> project.exec { commandLine = cmd.split(" ") standardOutput = outputStream @@ -25,7 +25,7 @@ fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String { fun gitVersion(): String { val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true) - var process = if (maybeTagOfCurrentCommit.isEmpty()) { + val process = if (maybeTagOfCurrentCommit.isEmpty()) { println("No tag on current commit. Will take the latest one.") execWithOutput("git -C ../ for-each-ref refs/tags --sort=-refname --format='%(refname:short)' --count=1") } else { @@ -65,15 +65,14 @@ android { kotlinOptions { jvmTarget = "17" } - compileSdk = 33 - buildToolsVersion = "33.0.0" + compileSdk = 34 buildFeatures { viewBinding = true } defaultConfig { applicationId = "bou.amine.apps.readerforselfossv2.android" minSdk = 21 - targetSdk = 33 + targetSdk = 34 versionCode = versionCodeFromGit() versionName = versionNameFromGit() @@ -86,7 +85,7 @@ android { // tests testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - packagingOptions { + packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } @@ -115,25 +114,25 @@ dependencies { coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") implementation(project(":shared")) - implementation("com.google.android.material:material:1.5.0") - implementation("androidx.appcompat:appcompat:1.4.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0") + implementation("com.google.android.material:material:1.9.0") + implementation("androidx.appcompat:appcompat:1.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1") - implementation("androidx.preference:preference-ktx:1.1.1") + implementation("androidx.preference:preference-ktx:1.2.1") implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs"))) // Android Support - implementation("androidx.appcompat:appcompat:1.4.1") - implementation("com.google.android.material:material:1.5.0") - implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01") + implementation("androidx.appcompat:appcompat:1.6.1") + implementation("com.google.android.material:material:1.9.0") + implementation("androidx.recyclerview:recyclerview:1.3.1") implementation("androidx.legacy:legacy-support-v4:1.0.0") - implementation("androidx.vectordrawable:vectordrawable:1.2.0-alpha02") + implementation("androidx.vectordrawable:vectordrawable:1.2.0-beta01") implementation("androidx.cardview:cardview:1.0.0") - implementation("androidx.annotation:annotation:1.3.0") - implementation("androidx.work:work-runtime-ktx:2.7.1") + implementation("androidx.annotation:annotation:1.7.0") + implementation("androidx.work:work-runtime-ktx:2.8.1") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("org.jsoup:jsoup:1.14.3") + implementation("org.jsoup:jsoup:1.15.4") //multidex implementation("androidx.multidex:multidex:2.0.1") @@ -154,7 +153,7 @@ dependencies { // Pager implementation("me.relex:circleindicator:2.1.6") - implementation("androidx.viewpager2:viewpager2:1.1.0-beta01") + implementation("androidx.viewpager2:viewpager2:1.1.0-beta02") //Dependency Injection implementation("org.kodein.di:kodein-di:7.14.0") @@ -170,7 +169,7 @@ dependencies { //PhotoView implementation("com.github.chrisbanes:PhotoView:2.3.0") - implementation("androidx.core:core-ktx:1.10.1") + implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") @@ -183,7 +182,7 @@ dependencies { //test testImplementation("junit:junit:4.13.2") testImplementation("io.mockk:mockk:1.12.0") - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0") implementation("ch.acra:acra-http:$acraVersion") diff --git a/build.gradle.kts b/build.gradle.kts index 814db5b..4452f8d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ buildscript { dependencies { // SqlDelight - classpath("com.squareup.sqldelight:gradle-plugin:1.5.4") + classpath("com.squareup.sqldelight:gradle-plugin:1.5.5") } } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index befcb5c..144e3c0 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -36,12 +36,12 @@ kotlin { implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion") implementation("io.ktor:ktor-client-logging:$ktorVersion") implementation("io.ktor:ktor-client-auth:$ktorVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") implementation("org.jsoup:jsoup:1.15.4") //Dependency Injection - implementation("org.kodein.di:kodein-di:7.12.0") + implementation("org.kodein.di:kodein-di:7.14.0") //Settings implementation("com.russhwolf:multiplatform-settings-no-arg:1.0.0-RC")