From ab6dfe9e256dafc9085617aba0a094462eef1337 Mon Sep 17 00:00:00 2001 From: arkon Date: Wed, 8 Feb 2023 22:53:42 -0500 Subject: [PATCH] Bump dependencies Fixes #8168, I think. --- .../domain/track/service/DelayedTrackingUpdateJob.kt | 6 +++--- .../kanade/tachiyomi/data/library/LibraryUpdateJob.kt | 10 +++++----- .../eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt | 6 +++--- .../kanade/tachiyomi/extension/ExtensionUpdateJob.kt | 6 +++--- gradle/androidx.versions.toml | 8 ++++---- gradle/compose.versions.toml | 6 +++--- gradle/kotlinx.versions.toml | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/eu/kanade/domain/track/service/DelayedTrackingUpdateJob.kt b/app/src/main/java/eu/kanade/domain/track/service/DelayedTrackingUpdateJob.kt index 46703440a4..e20db565d2 100644 --- a/app/src/main/java/eu/kanade/domain/track/service/DelayedTrackingUpdateJob.kt +++ b/app/src/main/java/eu/kanade/domain/track/service/DelayedTrackingUpdateJob.kt @@ -61,9 +61,9 @@ class DelayedTrackingUpdateJob(context: Context, workerParams: WorkerParameters) private const val TAG = "DelayedTrackingUpdate" fun setupTask(context: Context) { - val constraints = Constraints.Builder() - .setRequiredNetworkType(NetworkType.CONNECTED) - .build() + val constraints = Constraints( + requiredNetworkType = NetworkType.CONNECTED, + ) val request = OneTimeWorkRequestBuilder() .setConstraints(constraints) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt index cd81e18776..320d30dd59 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt @@ -550,11 +550,11 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet val interval = prefInterval ?: preferences.libraryUpdateInterval().get() if (interval > 0) { val restrictions = preferences.libraryUpdateDeviceRestriction().get() - val constraints = Constraints.Builder() - .setRequiredNetworkType(if (DEVICE_NETWORK_NOT_METERED in restrictions) { NetworkType.UNMETERED } else { NetworkType.CONNECTED }) - .setRequiresCharging(DEVICE_CHARGING in restrictions) - .setRequiresBatteryNotLow(DEVICE_BATTERY_NOT_LOW in restrictions) - .build() + val constraints = Constraints( + requiredNetworkType = if (DEVICE_NETWORK_NOT_METERED in restrictions) { NetworkType.UNMETERED } else { NetworkType.CONNECTED }, + requiresCharging = DEVICE_CHARGING in restrictions, + requiresBatteryNotLow = DEVICE_BATTERY_NOT_LOW in restrictions, + ) val request = PeriodicWorkRequestBuilder( interval.toLong(), diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt index 776061ca89..8145acf3c8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt @@ -37,9 +37,9 @@ class AppUpdateJob(private val context: Context, workerParams: WorkerParameters) return } - val constraints = Constraints.Builder() - .setRequiredNetworkType(NetworkType.CONNECTED) - .build() + val constraints = Constraints( + requiredNetworkType = NetworkType.CONNECTED, + ) val request = PeriodicWorkRequestBuilder( 7, diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt index 6713ad712e..dfd4b55c4b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt @@ -71,9 +71,9 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam val preferences = Injekt.get() val autoUpdateJob = forceAutoUpdateJob ?: preferences.automaticExtUpdates().get() if (autoUpdateJob) { - val constraints = Constraints.Builder() - .setRequiredNetworkType(NetworkType.CONNECTED) - .build() + val constraints = Constraints( + requiredNetworkType = NetworkType.CONNECTED, + ) val request = PeriodicWorkRequestBuilder( 2, diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml index cccf8a7f15..14a9de485d 100644 --- a/gradle/androidx.versions.toml +++ b/gradle/androidx.versions.toml @@ -1,12 +1,12 @@ [versions] agp_version = "7.4.1" -lifecycle_version = "2.5.1" +lifecycle_version = "2.6.0-beta01" [libraries] gradle = { module = "com.android.tools.build:gradle", version.ref = "agp_version" } annotation = "androidx.annotation:annotation:1.5.0" -appcompat = "androidx.appcompat:appcompat:1.6.0" +appcompat = "androidx.appcompat:appcompat:1.6.1" biometricktx = "androidx.biometric:biometric-ktx:1.2.0-alpha05" constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4" coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0" @@ -21,11 +21,11 @@ lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle_version" } lifecycle-runtimektx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle_version" } -work-runtime = "androidx.work:work-runtime-ktx:2.8.0-rc01" +work-runtime = "androidx.work:work-runtime-ktx:2.8.0" guava = "com.google.guava:guava:31.1-android" paging-runtime = "androidx.paging:paging-runtime:3.1.1" -paging-compose = "androidx.paging:paging-compose:1.0.0-alpha17" +paging-compose = "androidx.paging:paging-compose:1.0.0-alpha18" benchmark-macro = "androidx.benchmark:benchmark-macro-junit4:1.1.1" test-ext = "androidx.test.ext:junit-ktx:1.1.5" diff --git a/gradle/compose.versions.toml b/gradle/compose.versions.toml index 52b122f2c4..9cd0428dd1 100644 --- a/gradle/compose.versions.toml +++ b/gradle/compose.versions.toml @@ -1,5 +1,5 @@ [versions] -compiler = "1.4.0" +compiler = "1.4.2" compose-bom = "2023.01.00" accompanist = "0.28.0" @@ -16,9 +16,9 @@ material3-core = { module = "androidx.compose.material3:material3" } material-icons = { module = "androidx.compose.material:material-icons-extended" } # Here until M3's swipeable became public https://issuetracker.google.com/issues/234640556 -# Using alpha version for PullRefresh fix +# Using newer version for PullRefresh fix # TODO: use default version after next Compose BOM is released -material-core = { module = "androidx.compose.material:material", version = "1.4.0-alpha05" } +material-core = { module = "androidx.compose.material:material", version = "1.4.0-beta01" } accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version.ref = "accompanist" } accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } diff --git a/gradle/kotlinx.versions.toml b/gradle/kotlinx.versions.toml index bc62e6408e..0a4959ecda 100644 --- a/gradle/kotlinx.versions.toml +++ b/gradle/kotlinx.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin_version = "1.8.0" +kotlin_version = "1.8.10" serialization_version = "1.4.0" xml_serialization_version = "0.84.3"