Skip to content

Commit

Permalink
Update all dependencies (#3)
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
renovate[bot] authored and LouisFn committed May 20, 2023
1 parent 265053e commit 92c60b9
Show file tree
Hide file tree
Showing 13 changed files with 299 additions and 183 deletions.
4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/plugin/GradleVersionsPlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class GradleVersionsPlugin : Plugin<Project> {
}

private fun isNonStable(version: String): Boolean {
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
val regex = "^[\\d,.v-]+(-r)?$".toRegex()
val isStable = stableKeyword || regex.matches(version)
return isStable.not()
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.collectAsLazyPagingItems
import androidx.paging.compose.items
import androidx.paging.compose.itemKey
import com.louisfn.somovie.domain.model.Movie
import com.louisfn.somovie.feature.home.watchlist.WatchlistAction.ShowUndoSwipeToDismissSnackbar
import com.louisfn.somovie.feature.home.watchlist.WatchlistUiState.AccountLoggedIn.ContentState
Expand Down Expand Up @@ -264,9 +264,10 @@ private fun WatchlistLazyColumn(
Divider(color = MaterialTheme.colors.onBackground)
}
items(
items = pagingItems,
key = { it.movie.id }
) { movieItem ->
count = pagingItems.itemCount,
key = pagingItems.itemKey(key = { it.movie.id })
) { index ->
val movieItem = pagingItems[index]
Column {
if (movieItem != null) {
WatchlistMovieItem(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fun LogInWebView(
val currentOnApproved by rememberUpdatedState(onApproved)
val currentOnDenied by rememberUpdatedState(onDenied)

val currentUrl = state.content.getCurrentUrl()
val currentUrl = state.lastLoadedUrl
LaunchedEffect(key1 = currentUrl) {
currentUrl?.run {
when {
Expand Down
1 change: 0 additions & 1 deletion feature/moviedetails/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ android {

dependencies {
implementation(libs.accompanist.flowlayout)
implementation(libs.accompanist.pager)
implementation(libs.accompanist.pager.indicators)
}
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private fun ColumnScope.OverviewSection(overview: String) {

if (isButtonVisible) {
CompositionLocalProvider(
LocalMinimumTouchTargetEnforcement provides false
LocalMinimumInteractiveComponentEnforcement provides false
) {
DefaultTextButton(
text = stringResource(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
package com.louisfn.somovie.feature.moviedetails

import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.*
import androidx.compose.material.Divider
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.People
Expand All @@ -22,10 +39,7 @@ import androidx.compose.ui.unit.dp
import androidx.constraintlayout.compose.ConstraintLayout
import androidx.constraintlayout.compose.Dimension
import coil.compose.rememberAsyncImagePainter
import com.google.accompanist.pager.ExperimentalPagerApi
import com.google.accompanist.pager.HorizontalPager
import com.google.accompanist.pager.HorizontalPagerIndicator
import com.google.accompanist.pager.rememberPagerState
import com.louisfn.somovie.domain.model.BackdropPath
import com.louisfn.somovie.ui.common.LocalAppRouter
import com.louisfn.somovie.ui.common.model.ImmutableList
Expand Down Expand Up @@ -215,7 +229,7 @@ private fun MovieDetailsHeaderContent(
}
}

@OptIn(ExperimentalPagerApi::class)
@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun BackdropsPager(
backdropPaths: ImmutableList<BackdropPath>,
Expand All @@ -227,7 +241,7 @@ private fun BackdropsPager(
val pagerState = rememberPagerState()

HorizontalPager(
count = backdropPaths.size,
pageCount = backdropPaths.size,
state = pagerState,
modifier = Modifier
.fillMaxWidth()
Expand All @@ -243,6 +257,7 @@ private fun BackdropsPager(

HorizontalPagerIndicator(
pagerState = pagerState,
pageCount = backdropPaths.size,
activeColor = MaterialTheme.colors.onSurface,
modifier = Modifier
.align(Alignment.BottomCenter)
Expand Down
55 changes: 27 additions & 28 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,53 +1,52 @@
[versions]
accompanist = "0.28.0"
androidGradlePlugin = "7.3.1"
androidxActivityCompose = "1.6.1"
androidxAnnotation = "1.5.0"
androidxCompose = "1.3.2"
androidxComposeCompiler = "1.3.2"
androidxComposeMaterial = "1.3.1"
accompanist = "0.30.1"
androidGradlePlugin = "7.4.0"
androidxActivityCompose = "1.7.1"
androidxAnnotation = "1.6.0"
androidxCompose = "1.4.3"
androidxComposeCompiler = "1.4.2"
androidxComposeMaterial = "1.4.3"
androidxConstraintlayout = "1.0.1"
androidxCoreKtx = "1.9.0"
androidxCoreKtx = "1.10.1"
androidxDatastore = "1.0.0"
androidxLifecycle = "2.5.1"
androidxLifecycle = "2.6.1"
androidxNavigation = "2.5.3"
androidxPaging = "3.1.1"
androidxPagingCompose = "1.0.0-alpha17"
androidxRoom = "2.4.3"
androidxTest = "1.5.0"
androidxTestExt = "1.1.4"
androidxWebkit = "1.5.0"
coil = "2.2.2"
coroutines = "1.6.4"
androidxPagingCompose = "1.0.0-alpha19"
androidxRoom = "2.5.1"
androidxTest = "1.5.2"
androidxTestExt = "1.1.5"
androidxWebkit = "1.6.1"
coil = "2.3.0"
coroutines = "1.7.1"
detekt = "1.22.0"
detektCompose = "0.0.26"
faker = "1.12.0"
flipper = "0.176.1"
gradleversions = "0.44.0"
hilt = "2.44.2"
faker = "1.14.0"
flipper = "0.191.0"
gradleversions = "0.46.0"
hilt = "2.46.1"
hiltAndroidX = "1.0.0"
hiltCompose = "1.0.0"
jacoco = "0.8.7"
junit = "4.13.2"
jvm = "1.7.20"
kotest = "5.5.4"
kotlin = "1.7.20"
ksp = "1.7.20-1.0.8"
kotest = "5.6.2"
kotlin = "1.8.10"
ksp = "1.8.10-1.0.9"
ktlint = "0.46.1"
leakcanary = "2.10"
moshi = "1.14.0"
okHttpLoggingInterceptor = "4.10.0"
leakcanary = "2.11"
moshi = "1.15.0"
okHttpLoggingInterceptor = "4.11.0"
retrofit = "2.9.0"
soloader = "0.10.5"
spotless = "6.12.0"
spotless = "6.18.0"
timber = "5.0.1"

[libraries]
accompanist-flowlayout = { group = "com.google.accompanist", name = "accompanist-flowlayout", version.ref = "accompanist" }
accompanist-insets = { group = "com.google.accompanist", name = "accompanist-insets", version.ref = "accompanist" }
accompanist-insets-ui = { group = "com.google.accompanist", name = "accompanist-insets-ui", version.ref = "accompanist" }
accompanist-navigationAnimation = { group = "com.google.accompanist", name = "accompanist-navigation-animation", version.ref = "accompanist" }
accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" }
accompanist-pager-indicators = { group = "com.google.accompanist", name = "accompanist-pager-indicators", version.ref = "accompanist" }
accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" }
accompanist-webview = { group = "com.google.accompanist", name = "accompanist-webview", version.ref = "accompanist" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
Loading

0 comments on commit 92c60b9

Please sign in to comment.