Update to Compose 1.1.0-beta02 and other dependencies, optimize import (

#860) * update deps * optimize import for unused coroutines `plus`
chrisbanes · Nov 7, 2021 · 2309f9e · 2309f9e
1 parent 5e75864
commit 2309f9e
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 23 deletions.
diff --git a/domain/src/main/java/app/tivi/domain/interactors/AddEpisodeWatch.kt b/domain/src/main/java/app/tivi/domain/interactors/AddEpisodeWatch.kt
@@ -19,7 +19,6 @@ package app.tivi.domain.interactors
 import app.tivi.data.repositories.episodes.SeasonsEpisodesRepository
 import app.tivi.domain.Interactor
 import app.tivi.util.AppCoroutineDispatchers
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import org.threeten.bp.OffsetDateTime
 import javax.inject.Inject

diff --git a/domain/src/main/java/app/tivi/domain/interactors/ChangeSeasonFollowStatus.kt b/domain/src/main/java/app/tivi/domain/interactors/ChangeSeasonFollowStatus.kt
@@ -19,7 +19,6 @@ package app.tivi.domain.interactors
 import app.tivi.data.repositories.episodes.SeasonsEpisodesRepository
 import app.tivi.domain.Interactor
 import app.tivi.util.AppCoroutineDispatchers
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 

diff --git a/domain/src/main/java/app/tivi/domain/interactors/ChangeSeasonWatchedStatus.kt b/domain/src/main/java/app/tivi/domain/interactors/ChangeSeasonWatchedStatus.kt
@@ -20,7 +20,6 @@ import app.tivi.data.entities.ActionDate
 import app.tivi.data.repositories.episodes.SeasonsEpisodesRepository
 import app.tivi.domain.Interactor
 import app.tivi.util.AppCoroutineDispatchers
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 

diff --git a/domain/src/main/java/app/tivi/domain/interactors/DeleteFolder.kt b/domain/src/main/java/app/tivi/domain/interactors/DeleteFolder.kt
@@ -18,7 +18,6 @@ package app.tivi.domain.interactors
 
 import app.tivi.domain.Interactor
 import app.tivi.util.AppCoroutineDispatchers
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import java.io.File
 import javax.inject.Inject

diff --git a/domain/src/main/java/app/tivi/domain/interactors/RemoveEpisodeWatch.kt b/domain/src/main/java/app/tivi/domain/interactors/RemoveEpisodeWatch.kt
@@ -19,7 +19,6 @@ package app.tivi.domain.interactors
 import app.tivi.data.repositories.episodes.SeasonsEpisodesRepository
 import app.tivi.domain.Interactor
 import app.tivi.util.AppCoroutineDispatchers
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 

diff --git a/domain/src/main/java/app/tivi/domain/interactors/RemoveEpisodeWatches.kt b/domain/src/main/java/app/tivi/domain/interactors/RemoveEpisodeWatches.kt
@@ -19,7 +19,6 @@ package app.tivi.domain.interactors
 import app.tivi.data.repositories.episodes.SeasonsEpisodesRepository
 import app.tivi.domain.Interactor
 import app.tivi.util.AppCoroutineDispatchers
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 

diff --git a/domain/src/main/java/app/tivi/domain/interactors/UpdateEpisodeDetails.kt b/domain/src/main/java/app/tivi/domain/interactors/UpdateEpisodeDetails.kt
@@ -19,7 +19,6 @@ package app.tivi.domain.interactors
 import app.tivi.data.repositories.episodes.SeasonsEpisodesRepository
 import app.tivi.domain.Interactor
 import app.tivi.util.AppCoroutineDispatchers
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 

diff --git a/domain/src/main/java/app/tivi/domain/interactors/UpdateShowDetails.kt b/domain/src/main/java/app/tivi/domain/interactors/UpdateShowDetails.kt
@@ -22,7 +22,6 @@ import app.tivi.data.repositories.shows.ShowStore
 import app.tivi.domain.Interactor
 import app.tivi.domain.interactors.UpdateShowDetails.Params
 import app.tivi.util.AppCoroutineDispatchers
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 

diff --git a/domain/src/main/java/app/tivi/domain/interactors/UpdateShowSeasonData.kt b/domain/src/main/java/app/tivi/domain/interactors/UpdateShowSeasonData.kt
@@ -22,7 +22,6 @@ import app.tivi.domain.Interactor
 import app.tivi.domain.interactors.UpdateShowSeasonData.Params
 import app.tivi.util.AppCoroutineDispatchers
 import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 

diff --git a/domain/src/main/java/app/tivi/domain/interactors/UpdateShowSeasons.kt b/domain/src/main/java/app/tivi/domain/interactors/UpdateShowSeasons.kt
@@ -20,7 +20,6 @@ import app.tivi.data.repositories.episodes.SeasonsEpisodesRepository
 import app.tivi.domain.Interactor
 import app.tivi.domain.interactors.UpdateShowSeasons.Params
 import app.tivi.util.AppCoroutineDispatchers
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 

diff --git a/domain/src/main/java/app/tivi/domain/interactors/UpdateTmdbConfig.kt b/domain/src/main/java/app/tivi/domain/interactors/UpdateTmdbConfig.kt
@@ -19,7 +19,6 @@ package app.tivi.domain.interactors
 import app.tivi.domain.Interactor
 import app.tivi.tmdb.TmdbManager
 import app.tivi.util.AppCoroutineDispatchers
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 

diff --git a/domain/src/main/java/app/tivi/domain/interactors/UpdateUserDetails.kt b/domain/src/main/java/app/tivi/domain/interactors/UpdateUserDetails.kt
@@ -20,7 +20,6 @@ import app.tivi.data.repositories.traktusers.TraktUsersRepository
 import app.tivi.domain.Interactor
 import app.tivi.domain.interactors.UpdateUserDetails.Params
 import app.tivi.util.AppCoroutineDispatchers
-import kotlinx.coroutines.plus
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 

diff --git a/domain/src/main/java/app/tivi/domain/observers/ObserveShowImages.kt b/domain/src/main/java/app/tivi/domain/observers/ObserveShowImages.kt
@@ -22,7 +22,6 @@ import app.tivi.data.repositories.showimages.ShowImagesStore
 import app.tivi.domain.SubjectInteractor
 import app.tivi.util.AppCoroutineDispatchers
 import com.dropbox.android.external.store4.StoreRequest
-import com.dropbox.android.external.store4.get
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,18 +1,18 @@
 [versions]
-accompanist = "0.20.0"
+accompanist = "0.21.0-beta"
 androidxhilt = "1.0.0"
-androidxlifecycle = "2.4.0-rc01"
+androidxlifecycle = "2.4.0"
 androidxtest = "1.4.0"
 coil = "1.4.0"
-compose = "1.1.0-alpha06"
+compose = "1.1.0-beta02"
 composesnapshot = "-" # a single character = no snapshot
 coroutines = "1.5.2"
-dagger = "2.39.1"
-hilt = "2.39.1"
+dagger = "2.40"
+hilt = "2.40"
 kotlin = "1.5.31"
 ktlint = "0.42.1"
 okhttp = "4.9.2"
-paging = "3.1.0-beta01"
+paging = "3.1.0-rc01"
 retrofit = "2.9.0"
 room = "2.4.0-beta01"
 threetenbp = "1.5.1"
@@ -34,13 +34,13 @@ accompanist-pager-indicators = { module = "com.google.accompanist:accompanist-pa
 
 snapper = "dev.chrisbanes.snapper:snapper:0.1.0"
 
-android-pluginGradle = "com.android.tools.build:gradle:7.1.0-beta01"
+android-pluginGradle = "com.android.tools.build:gradle:7.1.0-beta02"
 
-androidx-activity-compose = "androidx.activity:activity-compose:1.4.0-rc01"
+androidx-activity-compose = "androidx.activity:activity-compose:1.4.0"
 androidx-archCoreTesting = "androidx.arch.core:core-testing:2.1.0"
 androidx-browser = "androidx.browser:browser:1.3.0"
 androidx-collection = "androidx.collection:collection-ktx:1.1.0"
-androidx-core = "androidx.core:core-ktx:1.6.0"
+androidx-core = "androidx.core:core-ktx:1.7.0"
 androidx-emoji = "androidx.emoji:emoji:1.1.0"
 
 androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidxhilt" }
@@ -51,7 +51,7 @@ androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-kt
 androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07"
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidxlifecycle" }
 
-androidx-navigation-compose = "androidx.navigation:navigation-compose:2.4.0-alpha10"
+androidx-navigation-compose = "androidx.navigation:navigation-compose:2.4.0-beta02"
 
 androidx-paging-common = { module = "androidx.paging:paging-common-ktx", version.ref = "paging" }
 androidx-paging-runtime = { module = "androidx.paging:paging-runtime-ktx", version.ref = "paging" }