Merge pull request #62 from ouchadam/feature/dep-updates

Dependency updates
This commit is contained in:
Adam Brown 2022-07-11 23:02:04 +01:00 committed by GitHub
commit d9953d840c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 37 additions and 7 deletions

View File

@ -61,7 +61,7 @@ android {
}
dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
coreLibraryDesugaring Dependencies.google.jdkLibs
implementation project(":features:home")
implementation project(":features:directory")

View File

@ -9,7 +9,7 @@ buildscript {
classpath Dependencies.mavenCentral.kotlinGradlePlugin
classpath Dependencies.mavenCentral.sqldelightGradlePlugin
classpath Dependencies.mavenCentral.kotlinSerializationGradlePlugin
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
classpath Dependencies.google.firebaseCrashlyticsPlugin
}
}

View File

@ -31,10 +31,12 @@ class SingletonFlows(
}
}
@Suppress("UNCHECKED_CAST")
fun <T> get(key: String): Flow<T> {
return cache[key]!! as Flow<T>
}
@Suppress("UNCHECKED_CAST")
suspend fun <T> update(key: String, value: T) {
(cache[key] as? MutableSharedFlow<T>)?.emit(value)
}

View File

@ -88,7 +88,7 @@ ext.Dependencies.with {
}
}
def kotlinVer = "1.6.10"
def kotlinVer = "1.7.0"
def sqldelightVer = "1.5.3"
def composeVer = "1.1.1"
def ktorVer = "2.0.3"
@ -102,7 +102,10 @@ ext.Dependencies.with {
androidxComposeMaterial = "androidx.compose.material:material:${composeVer}"
androidxComposeIconsExtended = "androidx.compose.material:material-icons-extended:${composeVer}"
androidxActivityCompose = "androidx.activity:activity-compose:1.4.0"
kotlinCompilerExtensionVersion = "${composeVer}"
kotlinCompilerExtensionVersion = "1.2.0"
firebaseCrashlyticsPlugin = "com.google.firebase:firebase-crashlytics-gradle:2.9.1"
jdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5"
}
mavenCentral = new DependenciesContainer()

View File

@ -41,6 +41,9 @@ fun LifecycleEffect(onStart: () -> Unit = {}, onStop: () -> Unit = {}) {
when (event) {
Lifecycle.Event.ON_START -> onStart()
Lifecycle.Event.ON_STOP -> onStop()
else -> {
// ignored
}
}
}

View File

@ -1,5 +1,5 @@
@file:JvmName("SnapshotStateKt")
@file:Suppress("UNUSED")
package androidx.compose.runtime
import kotlin.reflect.KProperty

View File

@ -6,6 +6,7 @@ import kotlinx.coroutines.test.runTest
import kotlinx.coroutines.test.setMain
import test.ExpectTest
@Suppress("UNCHECKED_CAST")
class ViewModelTest {
var instance: TestMutableState<Any>? = null

View File

@ -84,8 +84,7 @@ internal fun MessengerScreen(roomId: RoomId, viewModel: MessengerViewModel, navi
private fun MessengerViewModel.ObserveEvents() {
StartObserving {
this@ObserveEvents.events.launch {
when (it) {
}
// TODO()
}
}
}
@ -429,6 +428,10 @@ private fun ReplyBubbleContent(content: BubbleContent<RoomEvent.Reply>) {
)
Spacer(modifier = Modifier.height(4.dp))
}
is RoomEvent.Reply -> {
// TODO - a reply to a reply
}
}
}
@ -466,6 +469,10 @@ private fun ReplyBubbleContent(content: BubbleContent<RoomEvent.Reply>) {
)
Spacer(modifier = Modifier.height(4.dp))
}
is RoomEvent.Reply -> {
// TODO - a reply to a reply
}
}
Spacer(modifier = Modifier.height(2.dp))

View File

@ -199,6 +199,13 @@ private fun RootSettings(page: Page.Root, onClick: (SettingItem) -> Unit) {
item { Spacer(Modifier.height(12.dp)) }
}
}
is Lce.Error -> {
// TODO
}
is Lce.Loading -> {
// TODO
}
}
}

View File

@ -42,6 +42,13 @@ fun EventLogScreen(viewModel: EventLoggerViewModel) {
}
}
}
is Lce.Error -> {
// TODO
}
is Lce.Loading -> {
// TODO
}
}
}