From 72b99fa0dbe9f7602eaea1f0fbbb6ca0549993b8 Mon Sep 17 00:00:00 2001 From: Yash-Garg Date: Sat, 10 Jun 2023 15:08:42 +0530 Subject: [PATCH] chore(deps): bump all gradle dependencies and fix spotless --- .../qbit/data/manager/CilentManager.kt | 1 + .../qbit/ui/dialogs/AddTorrentDialog.kt | 1 + .../qbit/ui/dialogs/RemoveTorrentDialog.kt | 1 + .../qbit/ui/dialogs/RenameTorrentDialog.kt | 1 + benchmark/build.gradle.kts | 1 + .../commonMain/kotlin/internal/DataSync.kt | 2 + gradle/libs.versions.toml | 44 +++++++++---------- settings.gradle.kts | 2 +- 8 files changed, 30 insertions(+), 23 deletions(-) diff --git a/app/src/main/kotlin/dev/yashgarg/qbit/data/manager/CilentManager.kt b/app/src/main/kotlin/dev/yashgarg/qbit/data/manager/CilentManager.kt index 39014d22..65d9c4a5 100644 --- a/app/src/main/kotlin/dev/yashgarg/qbit/data/manager/CilentManager.kt +++ b/app/src/main/kotlin/dev/yashgarg/qbit/data/manager/CilentManager.kt @@ -14,6 +14,7 @@ import qbittorrent.QBittorrentClient interface ClientManager { val configStatus: SharedFlow + suspend fun checkAndGetClient(): QBittorrentClient? companion object { diff --git a/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/AddTorrentDialog.kt b/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/AddTorrentDialog.kt index 709554ff..bec14076 100644 --- a/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/AddTorrentDialog.kt +++ b/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/AddTorrentDialog.kt @@ -91,6 +91,7 @@ class AddTorrentDialog : DialogFragment() { companion object { fun newInstance(): AddTorrentDialog = AddTorrentDialog() + const val TAG = "AddTorrentDialogFragment" const val ADD_TORRENT_KEY = "add_torrent" const val ADD_TORRENT_FILE_KEY = "add_torrent_file" diff --git a/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/RemoveTorrentDialog.kt b/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/RemoveTorrentDialog.kt index d1cfa32e..ae3109d5 100644 --- a/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/RemoveTorrentDialog.kt +++ b/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/RemoveTorrentDialog.kt @@ -47,6 +47,7 @@ class RemoveTorrentDialog : DialogFragment() { companion object { fun newInstance(): RemoveTorrentDialog = RemoveTorrentDialog() + const val TAG = "RemoveTorrentDialogFragment" const val REMOVE_TORRENT_KEY = "remove_torrent" const val TORRENT_KEY = "torrent" diff --git a/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/RenameTorrentDialog.kt b/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/RenameTorrentDialog.kt index c05350dd..c0518de1 100644 --- a/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/RenameTorrentDialog.kt +++ b/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/RenameTorrentDialog.kt @@ -63,6 +63,7 @@ class RenameTorrentDialog : DialogFragment() { companion object { fun newInstance(): RenameTorrentDialog = RenameTorrentDialog() + const val TAG = "RenameTorrentDialogFragment" const val TORRENT_NAME_KEY = "torrent_name" const val RENAME_TORRENT_KEY = "rename_torrent" diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index 2755270d..6092712a 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -14,6 +14,7 @@ android { targetSdk = 33 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + missingDimensionStrategy("app", "nonFree", "free") } compileOptions { diff --git a/client-wrapper/client/src/commonMain/kotlin/internal/DataSync.kt b/client-wrapper/client/src/commonMain/kotlin/internal/DataSync.kt index 001a9437..2d477fc8 100644 --- a/client-wrapper/client/src/commonMain/kotlin/internal/DataSync.kt +++ b/client-wrapper/client/src/commonMain/kotlin/internal/DataSync.kt @@ -29,6 +29,7 @@ internal abstract class DataSync( abstract val endpointUrl: String abstract val nestedObjectKeys: List + open fun HttpRequestBuilder.configureRequest() = Unit private val serializer = serializer(requireNotNull(typeInfo.kotlinType)) @@ -41,6 +42,7 @@ internal abstract class DataSync( set(value) { atomicSyncRid.value = value } + private val syncLoopJob = syncScope.launch { while (true) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 612b91c2..8a275fa3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,33 +1,33 @@ [versions] -axCore = "1.10.0" +axCore = "1.10.1" axAppcompat = "1.6.1" -axActivity = "1.7.1" +axActivity = "1.7.2" axConstraintlayout = "2.1.4" axDatastore = "1.0.0" -axNavigation = "2.5.3" +axNavigation = "2.6.0" axTest = "1.4.0" axWork = "2.8.1" -coroutines = "1.7.0" +binary_compat = "0.13.2" +coroutines = "1.7.1" googleMaterial = "1.9.0" -agp = "8.1.0-beta02" +agp = "8.2.0-alpha07" espresso = "3.5.1" -hilt = "2.45" +hilt = "2.46.1" axHilt = "1.0.0" -ktor = "2.3.0" +ktor = "2.3.1" lifecycle = "2.6.1" -kotlin = "1.8.20" -binary_compat = "0.13.1" +kotlin = "1.8.22" mockito = "5.3.1" room = "2.5.1" -spotless = "6.18.0" +spotless = "6.19.0" uiautomator = "2.2.0" -serialization = "1.5.0" +serialization = "1.5.1" [libraries] androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "axCore" } androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "axActivity" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "axAppcompat" } -androidx-benchmark-junit = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha14" +androidx-benchmark-junit = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha15" androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "axConstraintlayout" } androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "axDatastore" } androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" @@ -53,12 +53,12 @@ build-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.r coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines" } kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } -coroutines-turbine = { module = "app.cash.turbine:turbine", version = "0.12.3" } +coroutines-turbine = { module = "app.cash.turbine:turbine", version = "0.13.0" } -compose-activity = "androidx.activity:activity-compose:1.7.1" -compose-compiler = "androidx.compose.compiler:compiler:1.4.6" +compose-activity = "androidx.activity:activity-compose:1.7.2" +compose-compiler = "androidx.compose.compiler:compiler:1.4.7" compose-foundation = "androidx.compose.foundation:foundation:1.4.3" -compose-material3 = "androidx.compose.material3:material3:1.0.1" +compose-material3 = "androidx.compose.material3:material3:1.1.0" compose-material-icons = "org.jetbrains.compose.material:material-icons-extended-desktop:1.4.0" compose-theme-adapter = "com.google.accompanist:accompanist-themeadapter-material3:0.30.1" @@ -75,15 +75,15 @@ ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "kto ktor-client-contentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" } ktor-serialization = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } -tools-leakcanary = "com.squareup.leakcanary:leakcanary-android:2.10" -tools-cascade = "me.saket.cascade:cascade:1.3.0" -tools-kotlin-result = "com.michael-bull.kotlin-result:kotlin-result:1.1.17" -tools-lottie = "com.airbnb.android:lottie:6.0.0" +tools-leakcanary = "com.squareup.leakcanary:leakcanary-android:2.11" +tools-cascade = "me.saket.cascade:cascade:2.0.0" +tools-kotlin-result = "com.michael-bull.kotlin-result:kotlin-result:1.1.18" +tools-lottie = "com.airbnb.android:lottie:6.0.1" tools-whatthestack = "com.github.haroldadmin:WhatTheStack:1.0.0-alpha04" junit = "junit:junit:4.13.2" mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } -mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:4.1.0" +mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:5.0.0" [plugins] android-application = { id = "com.android.application", version.ref = "agp" } @@ -97,7 +97,7 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } navigation-safeargs = { id = "androidx.navigation.safeargs", version.ref = "axNavigation" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } -sentry = "io.sentry.android.gradle:3.7.0" +sentry = "io.sentry.android.gradle:3.10.0" [bundles] compose = ["compose-theme-adapter", "compose-activity", "compose-foundation", "compose-material3"] diff --git a/settings.gradle.kts b/settings.gradle.kts index df93647a..305afc32 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,7 +18,7 @@ dependencyResolutionManagement { } } -plugins { id("com.gradle.enterprise") version "3.13.1" } +plugins { id("com.gradle.enterprise") version "3.13.3" } gradleEnterprise { buildScan {