Merge branch 'main' into dependabot/gradle/com.google.accompanist-accompanist-systemuicontroller-0.24.13-rc

.github/workflows/test.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Create pip requirements
         run: |
-          echo "matrix-synapse" > requirements.txt
+          echo "matrix-synapse==v1.60.0" > requirements.txt
 
       - name: Set up Python 3.8
         uses: actions/setup-python@v2

app/build.gradle

@@ -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")

build.gradle

@@ -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
     }
 }
 
@@ -133,7 +133,7 @@ ext.kotlinTest = { dependencies ->
     dependencies.testImplementation Dependencies.mavenCentral.kotlinTest
     dependencies.testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.6.10"
     dependencies.testImplementation 'io.mockk:mockk:1.12.4'
-    dependencies.testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3'
+    dependencies.testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
 
     dependencies.testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     dependencies.testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'

core/src/main/kotlin/app/dapk/st/core/SingletonFlows.kt

@@ -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)
     }

dependencies.gradle

@@ -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()
@@ -110,8 +113,8 @@ ext.Dependencies.with {
         kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVer}"
         kotlinSerializationGradlePlugin = "org.jetbrains.kotlin:kotlin-serialization:${kotlinVer}"
         kotlinSerializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
-        kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3"
-        kotlinCoroutinesTest = 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3'
+        kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+        kotlinCoroutinesTest = 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
         kotlinTest = "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVer}"
 
         sqldelightGradlePlugin = "com.squareup.sqldelight:gradle-plugin:${sqldelightVer}"

domains/android/compose-core/src/main/kotlin/app/dapk/st/core/ComposeExtensions.kt

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

domains/android/viewmodel-stub/src/main/kotlin/androidx/compose/runtime/MutableState.kt

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

domains/android/viewmodel/src/testFixtures/kotlin/ViewModelTest.kt

@@ -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

features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt

@@ -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))

features/notifications/src/main/kotlin/app/dapk/st/notifications/NotificationFactory.kt

@@ -70,6 +70,10 @@ class NotificationFactory(
             smallIcon = R.drawable.ic_notification_small_icon,
             contentIntent = openAppIntent,
             groupId = GROUP_ID,
+            groupAlertBehavior = deviceMeta.whenPOrHigher(
+                block = { Notification.GROUP_ALERT_SUMMARY },
+                fallback = { null }
+            ),
             isGroupSummary = true,
         )
     }

features/settings/src/main/kotlin/app/dapk/st/settings/SettingsScreen.kt

@@ -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
+        }
     }
 }
 

features/settings/src/main/kotlin/app/dapk/st/settings/eventlogger/EventLogScreen.kt

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Apr 02 22:45:08 BST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

matrix/services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/request/ApiSyncResponse.kt

@@ -484,8 +484,8 @@ internal sealed class ApiTimelineEvent {
 
                 @Serializable
                 internal data class Info(
-                    @SerialName("h") val height: Int,
-                    @SerialName("w") val width: Int,
+                    @SerialName("h") val height: Int? = null,
+                    @SerialName("w") val width: Int? = null,
                 )
             }