diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b72cb94b0..d070db15a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -233,7 +233,10 @@ dependencies { implementation("androidx.compose.material:material-icons-extended:${Versions.compose}") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1") implementation("androidx.compose.ui:ui-viewbinding:${Versions.compose}") - implementation("io.coil-kt:coil-compose:2.1.0") + implementation("io.coil-kt:coil-compose:${Versions.coil}") + implementation("io.coil-kt:coil-video:${Versions.coil}") + implementation("io.coil-kt:coil-svg:${Versions.coil}") + implementation("io.coil-kt:coil-gif:${Versions.coil}") releaseCompileOnly("androidx.compose.ui:ui-tooling:${Versions.compose}") implementation("com.google.accompanist:accompanist-flowlayout:${Versions.accompanist}") diff --git a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java index e06473a9c..75e4e504f 100644 --- a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java @@ -151,6 +151,10 @@ public class AndroidUtilities { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O; } + public static boolean atLeastP() { + return VERSION.SDK_INT >= Build.VERSION_CODES.P; + } + public static boolean atLeastQ() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q; } diff --git a/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt b/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt index b5f2773cf..56dadbe27 100644 --- a/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/AttachmentRow.kt @@ -1,29 +1,48 @@ package org.tasks.compose.edit import android.content.res.Configuration +import androidx.compose.foundation.border import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.ContentAlpha 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.outlined.Clear -import androidx.compose.runtime.Composable +import androidx.compose.material.icons.outlined.* +import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.core.net.toUri +import coil.ImageLoader +import coil.compose.AsyncImage +import coil.decode.GifDecoder +import coil.decode.ImageDecoderDecoder +import coil.decode.SvgDecoder +import coil.decode.VideoFrameDecoder +import coil.request.CachePolicy +import coil.request.ImageRequest +import com.google.accompanist.flowlayout.FlowRow import com.google.android.material.composethemeadapter.MdcTheme +import com.todoroo.andlib.utility.AndroidUtilities import org.tasks.R import org.tasks.compose.DisabledText import org.tasks.compose.TaskEditRow import org.tasks.data.TaskAttachment +import org.tasks.files.FileHelper + +private val SIZE = 128.dp @Composable fun AttachmentRow( @@ -32,48 +51,190 @@ fun AttachmentRow( deleteAttachment: (TaskAttachment) -> Unit, addAttachment: () -> Unit, ) { + val context = LocalContext.current + val imageLoader = remember { + ImageLoader.Builder(context) + .components { + add(VideoFrameDecoder.Factory()) + if (AndroidUtilities.atLeastP()) { + add(ImageDecoderDecoder.Factory(true)) + } else { + add(GifDecoder.Factory(true)) + } + add(SvgDecoder.Factory()) + } + .build() + } + val thumbnailSize = with(LocalDensity.current) { SIZE.toPx().toInt() } TaskEditRow( iconRes = R.drawable.ic_outline_attachment_24px, content = { - Column( - modifier = Modifier.padding(top = if (attachments.isEmpty()) 0.dp else 8.dp), - ) { - attachments.forEach { - Row( + if (attachments.isNotEmpty()) { + FlowRow( + mainAxisSpacing = 8.dp, + crossAxisSpacing = 8.dp, + modifier = Modifier.padding(top = 24.dp, bottom = 24.dp, end = 16.dp) + ) { + attachments.forEach { + val mimeType = FileHelper.getMimeType(LocalContext.current, it.uri.toUri()) + when { + mimeType?.startsWith("image/") == true || + mimeType?.startsWith("video/") == true -> { + Box { + var failed by remember { mutableStateOf(false) } + AsyncImage( + model = ImageRequest.Builder(LocalContext.current) + .memoryCachePolicy(CachePolicy.ENABLED) + .data(it.uri) + .crossfade(true) + .size(thumbnailSize) + .build(), + imageLoader = imageLoader, + contentDescription = null, + modifier = Modifier + .clip(RoundedCornerShape(8.dp)) + .clickable { openAttachment(it) }, + onError = { failed = true } + ) + if (failed) { + NoThumbnail( + filename = it.name, + mimeType = mimeType, + open = { openAttachment(it) }, + delete = { deleteAttachment(it) } + ) + } else { + if (mimeType.startsWith("video/")) { + Icon( + imageVector = Icons.Outlined.PlayCircle, + contentDescription = null, + tint = Color.White.copy( + alpha = ContentAlpha.medium + ), + modifier = Modifier.align(Alignment.Center), + ) + } + DeleteAttachment( + onClick = { deleteAttachment(it) }, + color = Color.White, + ) + } + } + } + else -> + NoThumbnail( + filename = it.name, + mimeType = mimeType, + open = { openAttachment(it) }, + delete = { deleteAttachment(it) }, + ) + } + } + Box( modifier = Modifier - .clickable { openAttachment(it) }, - verticalAlignment = Alignment.CenterVertically, + .height(SIZE) + .clickable { addAttachment() } + .border( + width = 1.dp, + color = MaterialTheme.colors.onSurface.copy(alpha = ContentAlpha.medium), + shape = RoundedCornerShape(8.dp), + ), ) { - Text( - text = it.name, - modifier = Modifier.weight(1f), + Icon( + imageVector = Icons.Outlined.Add, + contentDescription = stringResource(id = R.string.add_attachment), + modifier = Modifier + .size(48.dp) + .align(Alignment.Center), + tint = MaterialTheme.colors.onSurface.copy( + alpha = ContentAlpha.medium + ), ) - IconButton(onClick = { deleteAttachment(it) }) { - Icon( - imageVector = Icons.Outlined.Clear, - contentDescription = stringResource( - id = R.string.delete - ), - modifier = Modifier.alpha(ContentAlpha.medium), - ) - } } } + } else { DisabledText( text = stringResource(id = R.string.add_attachment), modifier = Modifier .fillMaxWidth() .clickable { addAttachment() } - .padding( - top = if (attachments.isEmpty()) 20.dp else 8.dp, - bottom = 20.dp, - ) + .padding(vertical = 20.dp), ) } }, ) } +@Composable +fun NoThumbnail( + filename: String, + mimeType: String?, + open: () -> Unit, + delete: () -> Unit, +) { + Box( + modifier = Modifier + .size(width = 100.dp, height = SIZE) + .clickable { open() } + .border( + width = 1.dp, + color = MaterialTheme.colors.onSurface.copy(alpha = ContentAlpha.medium), + shape = RoundedCornerShape(8.dp), + ), + ) { + Column(modifier = Modifier.align(Alignment.Center)) { + Icon( + imageVector = when { + mimeType?.startsWith("image/") == true -> Icons.Outlined.Image + mimeType?.startsWith("video/") == true -> Icons.Outlined.Movie + mimeType?.startsWith("audio/") == true -> Icons.Outlined.MusicNote + else -> Icons.Outlined.Description + }, + contentDescription = null, + modifier = Modifier + .align(Alignment.CenterHorizontally) + .alpha(ContentAlpha.medium), + tint = MaterialTheme.colors.onSurface.copy( + alpha = ContentAlpha.medium + ), + ) + Text( + text = filename, + style = MaterialTheme.typography.caption.copy( + textAlign = TextAlign.Center, + color = MaterialTheme.colors.onSurface, + ), + maxLines = 2, + overflow = TextOverflow.Ellipsis, + modifier = Modifier + .align(Alignment.CenterHorizontally) + .padding(8.dp), + ) + } + DeleteAttachment( + onClick = { delete() }, + color = MaterialTheme.colors.onSurface, + ) + } +} + +@Composable +fun BoxScope.DeleteAttachment( + onClick: () -> Unit, + color: Color, +) { + Icon( + imageVector = Icons.Outlined.Cancel, + contentDescription = null, + modifier = Modifier + .alpha(ContentAlpha.medium) + .align(Alignment.TopEnd) + .padding(vertical = 4.dp, horizontal = 4.dp) + .clickable { onClick() }, + tint = color.copy(alpha = ContentAlpha.medium), + ) +} + @Preview(showBackground = true, widthDp = 320) @Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES, widthDp = 320) @Composable diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 7fa89ce8e..d0ef4e4a1 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -22,4 +22,5 @@ object Versions { const val compose = "1.2.1" const val compose_theme_adapter = "1.1.11" const val accompanist = "0.24.12-rc" + const val coil = "2.2.0" } diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 4e8a11c36..d0785133e 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,46 +1,47 @@ ++--- androidx.databinding:viewbinding:7.2.2 -+| \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 ++| \--- org.jetbrains:annotations:13.0 -> 20.1.0 ++--- androidx.databinding:databinding-common:7.2.2 ++--- androidx.databinding:databinding-runtime:7.2.2 +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 -+| | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.databinding:databinding-common:7.2.2 +| +--- androidx.databinding:viewbinding:7.2.2 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.5.0-rc01 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 -+| | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.arch.core:core-runtime:2.1.0 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | \--- androidx.arch.core:core-common:2.1.0 (*) +| \--- androidx.lifecycle:lifecycle-common:2.5.0-rc01 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- androidx.lifecycle:lifecycle-common-java8:2.5.0-rc01 (c) ++--- androidx.databinding:databinding-adapters:7.2.2 +| +--- androidx.databinding:databinding-runtime:7.2.2 (*) +| \--- androidx.databinding:databinding-common:7.2.2 ++--- androidx.databinding:databinding-ktx:7.2.2 -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.6.1 -+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 -+| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1 -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1 -+| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (c) -+| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1 (c) -+| | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 (c) -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 -> 1.7.10 -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -+| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 -+| | | | | \--- org.jetbrains:annotations:13.0 -> 20.1.0 ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.6.4 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 ++| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 ++| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (c) ++| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (c) ++| | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 (c) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.7.10 ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 (*) +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0 -> 1.7.10 -+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 -> 1.7.10 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.7.10 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.7.10 (*) +| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -> 2.5.0-rc01 -+| | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.5.0-rc01 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 -> 2.4.1 +| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) @@ -51,14 +52,14 @@ +| +--- androidx.lifecycle:lifecycle-process:2.2.0 -> 2.4.1 +| | +--- androidx.lifecycle:lifecycle-runtime:2.4.1 -> 2.5.0-rc01 (*) +| | +--- androidx.startup:startup-runtime:1.1.1 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | \--- androidx.tracing:tracing:1.0.0 -+| | | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 -+| | \--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) ++| | \--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| +--- androidx.lifecycle:lifecycle-service:2.2.0 +| | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.5.0-rc01 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.0-rc01 (c) +| +--- androidx.databinding:databinding-runtime:7.2.2 (*) @@ -79,17 +80,17 @@ +| +--- org.slf4j:slf4j-jdk14:1.7.30 +| | \--- org.slf4j:slf4j-api:1.7.30 +| \--- androidx.core:core-ktx:1.3.2 -> 1.9.0-alpha05 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.core:core:1.9.0-alpha05 -+| | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | +--- androidx.annotation:annotation-experimental:1.1.0 +| | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | +--- androidx.concurrent:concurrent-futures:1.0.0 +| | | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -+| | | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 -> 2.5.0-rc01 (*) +| | +--- androidx.versionedparcelable:versionedparcelable:1.1.1 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | \--- androidx.core:core-ktx:1.9.0-alpha05 (c) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) @@ -102,54 +103,54 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.7.10 (*) +| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.0-alpha05 +| | +--- androidx.activity:activity:1.6.0-alpha05 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | | +--- androidx.core:core:1.9.0-alpha05 (*) +| | | +--- androidx.lifecycle:lifecycle-runtime:2.5.0-rc01 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.5.0-rc01 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.0-rc01 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | | +--- androidx.core:core-ktx:1.2.0 -> 1.9.0-alpha05 (*) +| | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.5.0-rc01 (*) +| | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.5.0-rc01 (*) +| | | | +--- androidx.savedstate:savedstate:1.2.0-rc01 -> 1.2.0 -+| | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | | | +--- androidx.arch.core:core-common:2.1.0 (*) +| | | | | +--- androidx.lifecycle:lifecycle-common:2.4.0 -> 2.5.0-rc01 (*) +| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.7.10 (*) +| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) -+| | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) ++| | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) +| | | +--- androidx.savedstate:savedstate:1.2.0-rc01 -> 1.2.0 (*) +| | | +--- androidx.tracing:tracing:1.0.0 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | | \--- androidx.activity:activity-ktx:1.6.0-alpha05 (c) -+| | +--- androidx.annotation:annotation:1.3.0 ++| | +--- androidx.annotation:annotation:1.3.0 -> 1.4.0 (*) +| | +--- androidx.appcompat:appcompat-resources:1.6.0-alpha05 -+| | | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | | +--- androidx.core:core:1.6.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 -+| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | | +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| | | | \--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| | | \--- androidx.vectordrawable:vectordrawable-animated:1.1.0 +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) +| | | +--- androidx.interpolator:interpolator:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | \--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | +--- androidx.core:core:1.9.0-alpha05 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 -+| | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | +--- androidx.drawerlayout:drawerlayout:1.0.0 -> 1.1.1 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.2.0 -> 1.9.0-alpha05 (*) +| | | \--- androidx.customview:customview:1.1.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.3.0 -> 1.9.0-alpha05 (*) +| | | \--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| | +--- androidx.emoji2:emoji2:1.2.0-alpha04 -+| | | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | | +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| | | +--- androidx.core:core:1.3.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.lifecycle:lifecycle-process:2.4.1 (*) @@ -159,15 +160,15 @@ +| | | +--- androidx.core:core:1.3.0 -> 1.9.0-alpha05 (*) +| | | \--- androidx.emoji2:emoji2:1.2.0-alpha04 (*) +| | +--- androidx.fragment:fragment:1.3.6 -> 1.4.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core-ktx:1.2.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| | | +--- androidx.viewpager:viewpager:1.0.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | | +--- androidx.core:core:1.0.0 -> 1.9.0-alpha05 (*) +| | | | \--- androidx.customview:customview:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.loader:loader:1.0.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | | +--- androidx.core:core:1.0.0 -> 1.9.0-alpha05 (*) +| | | | +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.4.1 (*) +| | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.5.0-rc01 (*) @@ -181,10 +182,10 @@ +| | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 -> 2.5.0-rc01 (*) +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 -> 2.5.0-rc01 (*) +| | +--- androidx.resourceinspection:resourceinspection-annotation:1.0.1 -+| | | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | \--- androidx.savedstate:savedstate:1.1.0 -> 1.2.0 (*) +| +--- androidx.cardview:cardview:1.0.0 -+| | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 +| | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.5.0-rc01 (*) +| | +--- androidx.arch.core:core-common:2.1.0 (*) @@ -201,17 +202,17 @@ +| | | +--- androidx.lifecycle:lifecycle-livedata-core:2.4.1 -> 2.5.0-rc01 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.7.10 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.7.10 (*) -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 -> 1.6.1 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 -> 1.6.4 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1 -> 2.5.0-rc01 +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.5.0-rc01 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) +| +--- com.google.android.material:material:1.6.0 -> 1.7.0-alpha02 -+| | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | +--- androidx.appcompat:appcompat:1.4.0 -> 1.6.0-alpha05 (*) +| | +--- androidx.cardview:cardview:1.0.0 (*) +| | +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) @@ -225,30 +226,30 @@ +| | | +--- androidx.core:core:1.0.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | | \--- androidx.legacy:legacy-support-core-utils:1.0.0 -+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.0.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.documentfile:documentfile:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | +--- androidx.loader:loader:1.0.0 (*) +| | | +--- androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | \--- androidx.print:print:1.0.0 -+| | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0 +| | +--- androidx.fragment:fragment:1.2.5 -> 1.4.0 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.5.0-rc01 (*) +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | +--- androidx.transition:transition:1.2.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.0.1 -> 1.9.0-alpha05 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) +| | \--- androidx.viewpager2:viewpager2:1.0.0 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.fragment:fragment:1.1.0 -> 1.4.0 (*) +| | +--- androidx.recyclerview:recyclerview:1.1.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) @@ -267,7 +268,7 @@ +| | +--- com.google.dagger:dagger:2.42 (*) +| | \--- javax.inject:javax.inject:1 +| +--- androidx.activity:activity:1.3.1 -> 1.6.0-alpha05 (*) -+| +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| +--- androidx.fragment:fragment:1.3.6 -> 1.4.0 (*) +| +--- androidx.lifecycle:lifecycle-common:2.3.1 -> 2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 -> 2.5.0-rc01 (*) @@ -276,7 +277,7 @@ +| +--- javax.inject:javax.inject:1 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.7.10 (*) ++--- androidx.hilt:hilt-work:1.0.0 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.hilt:hilt-common:1.0.0 +| | \--- com.google.dagger:hilt-core:2.35 -> 2.42 (*) +| +--- androidx.work:work-runtime:2.3.4 -> 2.7.1 @@ -287,11 +288,11 @@ +| | +--- androidx.core:core:1.6.0 -> 1.9.0-alpha05 (*) +| | +--- androidx.room:room-runtime:2.2.5 -> 2.4.2 +| | | +--- androidx.room:room-common:2.4.2 -+| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.sqlite:sqlite-framework:2.2.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | | \--- androidx.sqlite:sqlite:2.2.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | +--- androidx.sqlite:sqlite:2.2.0 (*) +| | | +--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) +| | | \--- androidx.annotation:annotation-experimental:1.1.0 @@ -326,18 +327,18 @@ +| +--- androidx.room:room-common:2.4.2 (*) +| +--- androidx.room:room-runtime:2.4.2 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.7.10 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*) ++--- androidx.appcompat:appcompat:1.6.0-alpha05 (*) ++--- androidx.paging:paging-runtime:2.1.2 +| +--- androidx.paging:paging-common:2.1.2 -+| | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | \--- androidx.arch.core:core-common:2.0.0 -> 2.1.0 (*) +| +--- androidx.arch.core:core-runtime:2.0.0 -> 2.1.0 (*) +| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.4.1 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) ++--- io.noties.markwon:core:4.6.2 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- io.noties.markwon:editor:4.6.2 +| \--- io.noties.markwon:core:4.6.2 (*) @@ -354,17 +355,17 @@ ++--- io.noties.markwon:linkify:4.6.2 +| \--- io.noties.markwon:core:4.6.2 (*) ++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 (*) -++--- com.squareup.okhttp3:okhttp:4.9.3 -+| +--- com.squareup.okio:okio:2.8.0 -> 3.0.0 -+| | \--- com.squareup.okio:okio-jvm:3.0.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.7.10 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 -> 1.7.10 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.7.10 (*) +++--- com.squareup.okhttp3:okhttp:4.9.3 -> 4.10.0 ++| +--- com.squareup.okio:okio:3.0.0 -> 3.2.0 ++| | \--- com.squareup.okio:okio-jvm:3.2.0 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.7.10 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20 -> 1.7.10 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.7.10 (*) ++--- com.google.code.gson:gson:2.8.8 ++--- com.google.android.material:material:1.6.1 -> 1.7.0-alpha02 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.2 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| \--- androidx.interpolator:interpolator:1.0.0 (*) ++--- androidx.preference:preference:1.1.1 @@ -372,7 +373,7 @@ +| +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| +--- androidx.fragment:fragment:1.2.4 -> 1.4.0 (*) +| +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) ++--- com.jakewharton.timber:timber:5.0.1 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.7.10 (*) @@ -411,47 +412,47 @@ ++--- androidx.work:work-runtime-ktx:2.7.1 +| +--- androidx.work:work-runtime:2.7.1 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.7.10 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 -> 1.6.1 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 -> 1.6.4 (*) ++--- com.etebase:client:2.3.2 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 -+| \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.9.3 (*) ++| \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.10.0 (*) ++--- com.github.QuadFlask:colorpicker:0.0.15 +| \--- androidx.appcompat:appcompat:1.1.0 -> 1.6.0-alpha05 (*) ++--- net.openid:appauth:0.8.1 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- androidx.browser:browser:1.3.0 +| +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| +--- androidx.concurrent:concurrent-futures:1.0.0 (*) +| +--- androidx.interpolator:interpolator:1.0.0 (*) +| +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++--- org.osmdroid:osmdroid-android:6.1.11 ++--- androidx.compose.ui:ui:1.2.1 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.autofill:autofill:1.0.0 +| | \--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| +--- androidx.compose.runtime:runtime:1.2.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) +| +--- androidx.compose.runtime:runtime-saveable:1.2.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.compose.runtime:runtime:1.2.1 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| +--- androidx.compose.ui:ui-geometry:1.2.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.compose.runtime:runtime:1.1.1 -> 1.2.1 (*) +| | +--- androidx.compose.ui:ui-util:1.2.1 +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| +--- androidx.compose.ui:ui-graphics:1.2.1 -+| | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | +--- androidx.compose.runtime:runtime:1.1.1 -> 1.2.1 (*) +| | +--- androidx.compose.ui:ui-unit:1.2.1 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.compose.runtime:runtime:1.1.1 -> 1.2.1 (*) +| | | +--- androidx.compose.ui:ui-geometry:1.2.1 (*) +| | | +--- androidx.compose.ui:ui-util:1.2.1 (*) @@ -459,7 +460,7 @@ +| | +--- androidx.compose.ui:ui-util:1.2.1 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.7.10 +| +--- androidx.compose.ui:ui-text:1.2.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | +--- androidx.compose.runtime:runtime:1.2.1 (*) +| | +--- androidx.compose.runtime:runtime-saveable:1.2.1 (*) @@ -469,7 +470,7 @@ +| | +--- androidx.core:core:1.5.0 -> 1.9.0-alpha05 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.7.10 -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 -> 1.6.4 (*) +| +--- androidx.compose.ui:ui-unit:1.2.1 (*) +| +--- androidx.compose.ui:ui-util:1.2.1 (*) +| +--- androidx.core:core:1.5.0 -> 1.9.0-alpha05 (*) @@ -477,32 +478,32 @@ +| | +--- androidx.core:core-ktx:1.5.0 -> 1.9.0-alpha05 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| +--- androidx.lifecycle:lifecycle-common-java8:2.3.0 -> 2.5.0-rc01 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | \--- androidx.lifecycle:lifecycle-common:2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.5.0-rc01 (*) +| +--- androidx.profileinstaller:profileinstaller:1.2.0 -+| | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | \--- androidx.startup:startup-runtime:1.1.1 (*) +| +--- androidx.savedstate:savedstate-ktx:1.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.7.10 -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 (*) ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 -> 1.6.4 (*) ++--- androidx.compose.foundation:foundation:1.2.1 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.compose.animation:animation:1.1.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.compose.animation:animation-core:1.1.1 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2 -> 1.6.1 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2 -> 1.6.4 (*) +| | | +--- androidx.compose.runtime:runtime:1.1.1 -> 1.2.1 (*) +| | | +--- androidx.compose.ui:ui:1.0.0 -> 1.2.1 (*) +| | | +--- androidx.compose.ui:ui-unit:1.0.0 -> 1.2.1 (*) +| | | +--- androidx.compose.ui:ui-util:1.0.0 -> 1.2.1 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.7.10 (*) +| | +--- androidx.compose.foundation:foundation-layout:1.0.0 -> 1.2.1 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.compose.animation:animation-core:1.1.1 (*) +| | | +--- androidx.compose.runtime:runtime:1.2.1 (*) +| | | +--- androidx.compose.ui:ui:1.2.1 (*) @@ -579,37 +580,47 @@ +| +--- androidx.databinding:viewbinding:4.1.2 -> 7.2.2 (*) +| +--- androidx.fragment:fragment-ktx:1.3.2 -> 1.4.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) -++--- io.coil-kt:coil-compose:2.1.0 -+| +--- io.coil-kt:coil-compose-base:2.1.0 -+| | +--- io.coil-kt:coil-base:2.1.0 -+| | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.7.10 (*) -+| | | | \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.10 -+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.7.10 (*) +++--- io.coil-kt:coil-compose:2.2.0 ++| +--- io.coil-kt:coil-compose-base:2.2.0 ++| | +--- io.coil-kt:coil-base:2.2.0 ++| | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.7.10 ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.7.10 ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 (*) +| | | +--- androidx.lifecycle:lifecycle-runtime:2.4.1 -> 2.5.0-rc01 (*) -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) -+| | | +--- com.squareup.okhttp3:okhttp:4.9.3 (*) -+| | | +--- com.squareup.okio:okio:3.0.0 (*) -+| | | +--- androidx.annotation:annotation:1.3.0 -+| | | +--- androidx.appcompat:appcompat-resources:1.4.1 -> 1.6.0-alpha05 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) ++| | | +--- com.squareup.okhttp3:okhttp:4.10.0 (*) ++| | | +--- com.squareup.okio:okio:3.2.0 (*) ++| | | +--- androidx.annotation:annotation:1.4.0 (*) ++| | | +--- androidx.appcompat:appcompat-resources:1.5.0 -> 1.6.0-alpha05 (*) +| | | +--- androidx.collection:collection:1.2.0 (*) -+| | | +--- androidx.core:core-ktx:1.7.0 -> 1.9.0-alpha05 (*) ++| | | +--- androidx.core:core-ktx:1.8.0 -> 1.9.0-alpha05 (*) +| | | \--- androidx.exifinterface:exifinterface:1.3.3 -+| | | \--- androidx.annotation:annotation:1.2.0 -> 1.3.0 -+| | +--- androidx.compose.foundation:foundation:1.1.1 -> 1.2.1 (*) -+| | +--- androidx.core:core-ktx:1.7.0 -> 1.9.0-alpha05 (*) -+| | \--- com.google.accompanist:accompanist-drawablepainter:0.23.1 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.7.10 (*) -+| | \--- androidx.compose.ui:ui:1.1.1 -> 1.2.1 (*) -+| \--- io.coil-kt:coil:2.1.0 -+| \--- io.coil-kt:coil-base:2.1.0 (*) ++| | | \--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) ++| | +--- androidx.compose.foundation:foundation:1.2.1 (*) ++| | +--- androidx.core:core-ktx:1.8.0 -> 1.9.0-alpha05 (*) ++| | \--- com.google.accompanist:accompanist-drawablepainter:0.25.1 ++| | \--- androidx.compose.ui:ui:1.2.1 (*) ++| \--- io.coil-kt:coil:2.2.0 ++| \--- io.coil-kt:coil-base:2.2.0 (*) +++--- io.coil-kt:coil-video:2.2.0 ++| +--- io.coil-kt:coil-base:2.2.0 (*) ++| \--- androidx.core:core-ktx:1.8.0 -> 1.9.0-alpha05 (*) +++--- io.coil-kt:coil-svg:2.2.0 ++| +--- io.coil-kt:coil-base:2.2.0 (*) ++| +--- androidx.core:core-ktx:1.8.0 -> 1.9.0-alpha05 (*) ++| \--- com.caverock:androidsvg-aar:1.4 +++--- io.coil-kt:coil-gif:2.2.0 ++| +--- io.coil-kt:coil-base:2.2.0 (*) ++| +--- androidx.core:core-ktx:1.8.0 -> 1.9.0-alpha05 (*) ++| \--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*) ++--- com.google.accompanist:accompanist-flowlayout:0.24.12-rc +| +--- androidx.compose.foundation:foundation:1.2.0-rc02 -> 1.2.1 (*) +| \--- androidx.compose.ui:ui-util:1.2.0-rc02 -> 1.2.1 (*) +\--- com.google.accompanist:accompanist-permissions:0.24.12-rc + +--- androidx.activity:activity-compose:1.5.0-rc01 (*) + +--- androidx.compose.foundation:foundation:1.2.0-rc02 -> 1.2.1 (*) -+ +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0 -> 1.6.1 (*) ++ +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0 -> 1.6.4 (*) + \--- io.github.aakira:napier:1.4.1 + \--- io.github.aakira:napier-android:1.4.1 + +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.7.10 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 3ff7435ea..7c5ea605e 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,46 +1,47 @@ ++--- androidx.databinding:viewbinding:7.2.2 -+| \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 ++| \--- org.jetbrains:annotations:13.0 -> 20.1.0 ++--- androidx.databinding:databinding-common:7.2.2 ++--- androidx.databinding:databinding-runtime:7.2.2 +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 -+| | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.databinding:databinding-common:7.2.2 +| +--- androidx.databinding:viewbinding:7.2.2 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.5.0-rc01 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 -+| | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.arch.core:core-runtime:2.1.0 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | \--- androidx.arch.core:core-common:2.1.0 (*) +| \--- androidx.lifecycle:lifecycle-common:2.5.0-rc01 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- androidx.lifecycle:lifecycle-common-java8:2.5.0-rc01 (c) ++--- androidx.databinding:databinding-adapters:7.2.2 +| +--- androidx.databinding:databinding-runtime:7.2.2 (*) +| \--- androidx.databinding:databinding-common:7.2.2 ++--- androidx.databinding:databinding-ktx:7.2.2 -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.6.1 -+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 -+| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1 -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1 -+| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (c) -+| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1 (c) -+| | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 (c) -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 -> 1.7.10 -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -+| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 -+| | | | | \--- org.jetbrains:annotations:13.0 -> 20.1.0 ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.6.4 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 ++| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 ++| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (c) ++| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (c) ++| | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 (c) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.7.10 ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 (*) +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0 -> 1.7.10 -+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0 -> 1.7.10 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.7.10 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.7.10 (*) +| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -> 2.5.0-rc01 -+| | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.5.0-rc01 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 -> 2.4.1 +| | +--- androidx.arch.core:core-common:2.1.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 (*) @@ -51,91 +52,91 @@ +| +--- androidx.lifecycle:lifecycle-process:2.2.0 -> 2.4.1 +| | +--- androidx.lifecycle:lifecycle-runtime:2.4.1 -> 2.5.0-rc01 (*) +| | +--- androidx.startup:startup-runtime:1.1.1 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | \--- androidx.tracing:tracing:1.0.0 -+| | | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 -+| | \--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) ++| | \--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| +--- androidx.lifecycle:lifecycle-service:2.2.0 +| | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.5.0-rc01 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.0-rc01 (c) +| +--- androidx.databinding:databinding-runtime:7.2.2 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.7.10 (*) ++--- com.google.firebase:firebase-crashlytics:18.2.11 +| +--- com.google.android.datatransport:transport-api:3.0.0 -+| | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- com.google.android.datatransport:transport-backend-cct:3.1.5 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- com.google.android.datatransport:transport-api:3.0.0 (*) +| | +--- com.google.android.datatransport:transport-runtime:3.1.5 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- com.google.android.datatransport:transport-api:3.0.0 (*) +| | | +--- com.google.firebase:firebase-encoders:17.0.0 -+| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- com.google.firebase:firebase-encoders-proto:16.0.0 -+| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | | \--- com.google.firebase:firebase-encoders:17.0.0 (*) +| | | \--- javax.inject:javax.inject:1 +| | +--- com.google.firebase:firebase-encoders:17.0.0 (*) +| | \--- com.google.firebase:firebase-encoders-json:18.0.0 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | \--- com.google.firebase:firebase-encoders:17.0.0 (*) +| +--- com.google.android.datatransport:transport-runtime:3.1.5 (*) +| +--- com.google.android.gms:play-services-tasks:18.0.1 +| | \--- com.google.android.gms:play-services-basement:18.0.0 +| | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | +--- androidx.core:core:1.2.0 -> 1.9.0-alpha05 -+| | | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | | +--- androidx.annotation:annotation-experimental:1.1.0 +| | | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | | +--- androidx.concurrent:concurrent-futures:1.0.0 +| | | | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -+| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 -> 2.5.0-rc01 (*) +| | | +--- androidx.versionedparcelable:versionedparcelable:1.1.1 -+| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | | \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | | \--- androidx.core:core-ktx:1.9.0-alpha05 (c) +| | \--- androidx.fragment:fragment:1.0.0 -> 1.4.0 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.core:core-ktx:1.2.0 -> 1.9.0-alpha05 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.9.0-alpha05 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | | \--- androidx.core:core:1.9.0-alpha05 (c) +| | +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| | +--- androidx.viewpager:viewpager:1.0.0 -+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.0.0 -> 1.9.0-alpha05 (*) +| | | \--- androidx.customview:customview:1.0.0 -> 1.1.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.3.0 -> 1.9.0-alpha05 (*) +| | | \--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| | +--- androidx.loader:loader:1.0.0 -+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.0.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.4.1 (*) +| | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.5.0-rc01 (*) +| | +--- androidx.activity:activity:1.2.4 -> 1.6.0-alpha05 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | | +--- androidx.core:core:1.9.0-alpha05 (*) +| | | +--- androidx.lifecycle:lifecycle-runtime:2.5.0-rc01 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.5.0-rc01 (*) +| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.0-rc01 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | | +--- androidx.core:core-ktx:1.2.0 -> 1.9.0-alpha05 (*) +| | | | +--- androidx.lifecycle:lifecycle-livedata-core:2.5.0-rc01 (*) +| | | | +--- androidx.lifecycle:lifecycle-viewmodel:2.5.0-rc01 (*) +| | | | +--- androidx.savedstate:savedstate:1.2.0-rc01 -> 1.2.0 -+| | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | | | +--- androidx.arch.core:core-common:2.1.0 (*) +| | | | | +--- androidx.lifecycle:lifecycle-common:2.4.0 -> 2.5.0-rc01 (*) +| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.7.10 (*) +| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) -+| | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) ++| | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) +| | | +--- androidx.savedstate:savedstate:1.2.0-rc01 -> 1.2.0 (*) +| | | +--- androidx.tracing:tracing:1.0.0 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) @@ -151,7 +152,7 @@ +| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | +--- com.google.android.gms:play-services-tasks:18.0.1 (*) +| | \--- com.google.firebase:firebase-components:17.0.0 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | \--- com.google.firebase:firebase-annotations:16.0.0 +| +--- com.google.firebase:firebase-components:17.0.0 (*) +| +--- com.google.firebase:firebase-encoders:17.0.0 (*) @@ -171,15 +172,15 @@ +| +--- com.google.android.gms:play-services-measurement:20.1.0 +| | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | +--- androidx.legacy:legacy-support-core-utils:1.0.0 -+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.0.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.documentfile:documentfile:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | +--- androidx.loader:loader:1.0.0 (*) +| | | +--- androidx.localbroadcastmanager:localbroadcastmanager:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | \--- androidx.print:print:1.0.0 -+| | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | +--- com.google.android.gms:play-services-basement:18.0.0 (*) +| | +--- com.google.android.gms:play-services-measurement-base:20.1.0 +| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*) @@ -210,7 +211,7 @@ +| +--- com.google.android.gms:play-services-measurement-base:20.1.0 (*) +| \--- com.google.android.gms:play-services-measurement-impl:20.1.0 (*) ++--- com.google.firebase:firebase-config-ktx:21.0.1 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- com.google.firebase:firebase-abt:21.0.0 +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*) +| | +--- com.google.firebase:firebase-common:20.0.0 -> 20.1.1 (*) @@ -218,7 +219,7 @@ +| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 -> 19.0.0 (*) +| +--- com.google.firebase:firebase-common:20.0.0 -> 20.1.1 (*) +| +--- com.google.firebase:firebase-common-ktx:20.0.0 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- com.google.firebase:firebase-common:20.0.0 -> 20.1.1 (*) +| | +--- com.google.firebase:firebase-components:17.0.0 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.7.10 (*) @@ -252,41 +253,41 @@ ++--- com.android.billingclient:billing-ktx:3.0.3 +| +--- com.android.billingclient:billing:3.0.3 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.7.10 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.1 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.4 (*) ++--- com.google.android.play:core:1.10.3 ++--- com.google.android.play:core-ktx:1.8.1 +| +--- com.google.android.play:core:1.8.0 -> 1.10.3 +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.7.10 (*) -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6 -> 1.6.1 (*) ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6 -> 1.6.4 (*) +| +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| \--- androidx.fragment:fragment:1.1.0 -> 1.4.0 (*) ++--- com.google.android.gms:play-services-oss-licenses:17.0.0 +| +--- androidx.appcompat:appcompat:1.0.0 -> 1.6.0-alpha05 +| | +--- androidx.activity:activity:1.6.0-alpha05 (*) -+| | +--- androidx.annotation:annotation:1.3.0 ++| | +--- androidx.annotation:annotation:1.3.0 -> 1.4.0 (*) +| | +--- androidx.appcompat:appcompat-resources:1.6.0-alpha05 -+| | | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | | +--- androidx.core:core:1.6.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 -+| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | | +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| | | | \--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| | | \--- androidx.vectordrawable:vectordrawable-animated:1.1.0 +| | | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) +| | | +--- androidx.interpolator:interpolator:1.0.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | \--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | +--- androidx.core:core:1.9.0-alpha05 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 -+| | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | +--- androidx.drawerlayout:drawerlayout:1.0.0 -> 1.1.1 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.2.0 -> 1.9.0-alpha05 (*) +| | | \--- androidx.customview:customview:1.1.0 (*) +| | +--- androidx.emoji2:emoji2:1.2.0-alpha04 -+| | | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | | +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| | | +--- androidx.core:core:1.3.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.lifecycle:lifecycle-process:2.4.1 (*) @@ -299,7 +300,7 @@ +| | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 -> 2.5.0-rc01 (*) +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 -> 2.5.0-rc01 (*) +| | +--- androidx.resourceinspection:resourceinspection-annotation:1.0.1 -+| | | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | \--- androidx.savedstate:savedstate:1.1.0 -> 1.2.0 (*) +| +--- androidx.loader:loader:1.0.0 (*) +| +--- com.google.android.gms:play-services-base:17.0.0 -> 18.0.1 (*) @@ -329,7 +330,7 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.7.10 (*) +| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.0-alpha05 (*) +| +--- androidx.cardview:cardview:1.0.0 -+| | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 +| | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.5.0-rc01 (*) +| | +--- androidx.arch.core:core-common:2.1.0 (*) @@ -346,17 +347,17 @@ +| | | +--- androidx.lifecycle:lifecycle-livedata-core:2.4.1 -> 2.5.0-rc01 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.7.10 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.7.10 (*) -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 -> 1.6.1 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 -> 1.6.4 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1 -> 2.5.0-rc01 +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.5.0-rc01 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) +| +--- com.google.android.material:material:1.6.0 -> 1.7.0-alpha02 -+| | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | +--- androidx.appcompat:appcompat:1.4.0 -> 1.6.0-alpha05 (*) +| | +--- androidx.cardview:cardview:1.0.0 (*) +| | +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) @@ -374,17 +375,17 @@ +| | +--- androidx.fragment:fragment:1.2.5 -> 1.4.0 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.5.0-rc01 (*) +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| | | +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | +--- androidx.transition:transition:1.2.0 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.core:core:1.0.1 -> 1.9.0-alpha05 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | +--- androidx.vectordrawable:vectordrawable:1.1.0 (*) +| | \--- androidx.viewpager2:viewpager2:1.0.0 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.fragment:fragment:1.1.0 -> 1.4.0 (*) +| | +--- androidx.recyclerview:recyclerview:1.1.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) @@ -403,7 +404,7 @@ +| | +--- com.google.dagger:dagger:2.42 (*) +| | \--- javax.inject:javax.inject:1 +| +--- androidx.activity:activity:1.3.1 -> 1.6.0-alpha05 (*) -+| +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| +--- androidx.fragment:fragment:1.3.6 -> 1.4.0 (*) +| +--- androidx.lifecycle:lifecycle-common:2.3.1 -> 2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 -> 2.5.0-rc01 (*) @@ -412,7 +413,7 @@ +| +--- javax.inject:javax.inject:1 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.7.10 (*) ++--- androidx.hilt:hilt-work:1.0.0 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.hilt:hilt-common:1.0.0 +| | \--- com.google.dagger:hilt-core:2.35 -> 2.42 (*) +| +--- androidx.work:work-runtime:2.3.4 -> 2.7.1 @@ -423,11 +424,11 @@ +| | +--- androidx.core:core:1.6.0 -> 1.9.0-alpha05 (*) +| | +--- androidx.room:room-runtime:2.2.5 -> 2.4.2 +| | | +--- androidx.room:room-common:2.4.2 -+| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.sqlite:sqlite-framework:2.2.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | | \--- androidx.sqlite:sqlite:2.2.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | | +--- androidx.sqlite:sqlite:2.2.0 (*) +| | | +--- androidx.arch.core:core-runtime:2.0.1 -> 2.1.0 (*) +| | | \--- androidx.annotation:annotation-experimental:1.1.0 @@ -462,18 +463,18 @@ +| +--- androidx.room:room-common:2.4.2 (*) +| +--- androidx.room:room-runtime:2.4.2 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.7.10 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.1 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*) ++--- androidx.appcompat:appcompat:1.6.0-alpha05 (*) ++--- androidx.paging:paging-runtime:2.1.2 +| +--- androidx.paging:paging-common:2.1.2 -+| | +--- androidx.annotation:annotation:1.0.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.0.0 -> 1.4.0 (*) +| | \--- androidx.arch.core:core-common:2.0.0 -> 2.1.0 (*) +| +--- androidx.arch.core:core-runtime:2.0.0 -> 2.1.0 (*) +| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.4.1 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) ++--- io.noties.markwon:core:4.6.2 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- io.noties.markwon:editor:4.6.2 +| \--- io.noties.markwon:core:4.6.2 (*) @@ -490,17 +491,17 @@ ++--- io.noties.markwon:linkify:4.6.2 +| \--- io.noties.markwon:core:4.6.2 (*) ++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 (*) -++--- com.squareup.okhttp3:okhttp:4.9.3 -+| +--- com.squareup.okio:okio:2.8.0 -> 3.0.0 -+| | \--- com.squareup.okio:okio-jvm:3.0.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.7.10 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31 -> 1.7.10 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.7.10 (*) +++--- com.squareup.okhttp3:okhttp:4.9.3 -> 4.10.0 ++| +--- com.squareup.okio:okio:3.0.0 -> 3.2.0 ++| | \--- com.squareup.okio:okio-jvm:3.2.0 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.7.10 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20 -> 1.7.10 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.7.10 (*) ++--- com.google.code.gson:gson:2.8.8 ++--- com.google.android.material:material:1.6.1 -> 1.7.0-alpha02 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.2 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| \--- androidx.interpolator:interpolator:1.0.0 (*) ++--- androidx.preference:preference:1.1.1 @@ -508,7 +509,7 @@ +| +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| +--- androidx.fragment:fragment:1.2.4 -> 1.4.0 (*) +| +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) ++--- com.jakewharton.timber:timber:5.0.1 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.7.10 (*) @@ -547,47 +548,47 @@ ++--- androidx.work:work-runtime-ktx:2.7.1 +| +--- androidx.work:work-runtime:2.7.1 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.7.10 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 -> 1.6.1 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 -> 1.6.4 (*) ++--- com.etebase:client:2.3.2 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 -+| \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.9.3 (*) ++| \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.10.0 (*) ++--- com.github.QuadFlask:colorpicker:0.0.15 +| \--- androidx.appcompat:appcompat:1.1.0 -> 1.6.0-alpha05 (*) ++--- net.openid:appauth:0.8.1 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- androidx.browser:browser:1.3.0 +| +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*) +| +--- androidx.concurrent:concurrent-futures:1.0.0 (*) +| +--- androidx.interpolator:interpolator:1.0.0 (*) +| +--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++--- org.osmdroid:osmdroid-android:6.1.11 ++--- androidx.compose.ui:ui:1.2.1 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.autofill:autofill:1.0.0 +| | \--- androidx.core:core:1.1.0 -> 1.9.0-alpha05 (*) +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| +--- androidx.compose.runtime:runtime:1.2.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) +| +--- androidx.compose.runtime:runtime-saveable:1.2.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.compose.runtime:runtime:1.2.1 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| +--- androidx.compose.ui:ui-geometry:1.2.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.compose.runtime:runtime:1.1.1 -> 1.2.1 (*) +| | +--- androidx.compose.ui:ui-util:1.2.1 +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| +--- androidx.compose.ui:ui-graphics:1.2.1 -+| | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | +--- androidx.compose.runtime:runtime:1.1.1 -> 1.2.1 (*) +| | +--- androidx.compose.ui:ui-unit:1.2.1 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.compose.runtime:runtime:1.1.1 -> 1.2.1 (*) +| | | +--- androidx.compose.ui:ui-geometry:1.2.1 (*) +| | | +--- androidx.compose.ui:ui-util:1.2.1 (*) @@ -595,7 +596,7 @@ +| | +--- androidx.compose.ui:ui-util:1.2.1 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.7.10 +| +--- androidx.compose.ui:ui-text:1.2.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*) +| | +--- androidx.compose.runtime:runtime:1.2.1 (*) +| | +--- androidx.compose.runtime:runtime-saveable:1.2.1 (*) @@ -605,7 +606,7 @@ +| | +--- androidx.core:core:1.5.0 -> 1.9.0-alpha05 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.7.10 -+| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 (*) ++| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 -> 1.6.4 (*) +| +--- androidx.compose.ui:ui-unit:1.2.1 (*) +| +--- androidx.compose.ui:ui-util:1.2.1 (*) +| +--- androidx.core:core:1.5.0 -> 1.9.0-alpha05 (*) @@ -613,32 +614,32 @@ +| | +--- androidx.core:core-ktx:1.5.0 -> 1.9.0-alpha05 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| +--- androidx.lifecycle:lifecycle-common-java8:2.3.0 -> 2.5.0-rc01 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | \--- androidx.lifecycle:lifecycle-common:2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-runtime:2.3.0 -> 2.5.0-rc01 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 -> 2.5.0-rc01 (*) +| +--- androidx.profileinstaller:profileinstaller:1.2.0 -+| | +--- androidx.annotation:annotation:1.2.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) +| | \--- androidx.startup:startup-runtime:1.1.1 (*) +| +--- androidx.savedstate:savedstate-ktx:1.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -> 1.7.10 -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 (*) ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 -> 1.6.4 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1 -> 1.6.4 (*) ++--- androidx.compose.foundation:foundation:1.2.1 -+| +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| +--- androidx.compose.animation:animation:1.1.1 -+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | +--- androidx.compose.animation:animation-core:1.1.1 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2 -> 1.6.1 (*) ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2 -> 1.6.4 (*) +| | | +--- androidx.compose.runtime:runtime:1.1.1 -> 1.2.1 (*) +| | | +--- androidx.compose.ui:ui:1.0.0 -> 1.2.1 (*) +| | | +--- androidx.compose.ui:ui-unit:1.0.0 -> 1.2.1 (*) +| | | +--- androidx.compose.ui:ui-util:1.0.0 -> 1.2.1 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.7.10 (*) +| | +--- androidx.compose.foundation:foundation-layout:1.0.0 -> 1.2.1 -+| | | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.4.0 (*) +| | | +--- androidx.compose.animation:animation-core:1.1.1 (*) +| | | +--- androidx.compose.runtime:runtime:1.2.1 (*) +| | | +--- androidx.compose.ui:ui:1.2.1 (*) @@ -715,37 +716,47 @@ +| +--- androidx.databinding:viewbinding:4.1.2 -> 7.2.2 (*) +| +--- androidx.fragment:fragment-ktx:1.3.2 -> 1.4.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.7.10 (*) -++--- io.coil-kt:coil-compose:2.1.0 -+| +--- io.coil-kt:coil-compose-base:2.1.0 -+| | +--- io.coil-kt:coil-base:2.1.0 -+| | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.6.10 -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.7.10 (*) -+| | | | \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.10 -+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.7.10 (*) +++--- io.coil-kt:coil-compose:2.2.0 ++| +--- io.coil-kt:coil-compose-base:2.2.0 ++| | +--- io.coil-kt:coil-base:2.2.0 ++| | | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.7.10 ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.7.10 ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 (*) +| | | +--- androidx.lifecycle:lifecycle-runtime:2.4.1 -> 2.5.0-rc01 (*) -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1 (*) -+| | | +--- com.squareup.okhttp3:okhttp:4.9.3 (*) -+| | | +--- com.squareup.okio:okio:3.0.0 (*) -+| | | +--- androidx.annotation:annotation:1.3.0 -+| | | +--- androidx.appcompat:appcompat-resources:1.4.1 -> 1.6.0-alpha05 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) ++| | | +--- com.squareup.okhttp3:okhttp:4.10.0 (*) ++| | | +--- com.squareup.okio:okio:3.2.0 (*) ++| | | +--- androidx.annotation:annotation:1.4.0 (*) ++| | | +--- androidx.appcompat:appcompat-resources:1.5.0 -> 1.6.0-alpha05 (*) +| | | +--- androidx.collection:collection:1.2.0 (*) -+| | | +--- androidx.core:core-ktx:1.7.0 -> 1.9.0-alpha05 (*) ++| | | +--- androidx.core:core-ktx:1.8.0 -> 1.9.0-alpha05 (*) +| | | \--- androidx.exifinterface:exifinterface:1.3.3 -+| | | \--- androidx.annotation:annotation:1.2.0 -> 1.3.0 -+| | +--- androidx.compose.foundation:foundation:1.1.1 -> 1.2.1 (*) -+| | +--- androidx.core:core-ktx:1.7.0 -> 1.9.0-alpha05 (*) -+| | \--- com.google.accompanist:accompanist-drawablepainter:0.23.1 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.7.10 (*) -+| | \--- androidx.compose.ui:ui:1.1.1 -> 1.2.1 (*) -+| \--- io.coil-kt:coil:2.1.0 -+| \--- io.coil-kt:coil-base:2.1.0 (*) ++| | | \--- androidx.annotation:annotation:1.2.0 -> 1.4.0 (*) ++| | +--- androidx.compose.foundation:foundation:1.2.1 (*) ++| | +--- androidx.core:core-ktx:1.8.0 -> 1.9.0-alpha05 (*) ++| | \--- com.google.accompanist:accompanist-drawablepainter:0.25.1 ++| | \--- androidx.compose.ui:ui:1.2.1 (*) ++| \--- io.coil-kt:coil:2.2.0 ++| \--- io.coil-kt:coil-base:2.2.0 (*) +++--- io.coil-kt:coil-video:2.2.0 ++| +--- io.coil-kt:coil-base:2.2.0 (*) ++| \--- androidx.core:core-ktx:1.8.0 -> 1.9.0-alpha05 (*) +++--- io.coil-kt:coil-svg:2.2.0 ++| +--- io.coil-kt:coil-base:2.2.0 (*) ++| +--- androidx.core:core-ktx:1.8.0 -> 1.9.0-alpha05 (*) ++| \--- com.caverock:androidsvg-aar:1.4 +++--- io.coil-kt:coil-gif:2.2.0 ++| +--- io.coil-kt:coil-base:2.2.0 (*) ++| +--- androidx.core:core-ktx:1.8.0 -> 1.9.0-alpha05 (*) ++| \--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*) ++--- com.google.accompanist:accompanist-flowlayout:0.24.12-rc +| +--- androidx.compose.foundation:foundation:1.2.0-rc02 -> 1.2.1 (*) +| \--- androidx.compose.ui:ui-util:1.2.0-rc02 -> 1.2.1 (*) +\--- com.google.accompanist:accompanist-permissions:0.24.12-rc + +--- androidx.activity:activity-compose:1.5.0-rc01 (*) + +--- androidx.compose.foundation:foundation:1.2.0-rc02 -> 1.2.1 (*) -+ +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0 -> 1.6.1 (*) ++ +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0 -> 1.6.4 (*) + \--- io.github.aakira:napier:1.4.1 + \--- io.github.aakira:napier-android:1.4.1 + +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.7.10 (*)