Fix lint

Author: LionZXY

build-logic/plugins/convention/src/main/kotlin/com/flipperdevices/buildlogic/ApkConfig.kt

@@ -8,8 +8,8 @@ object ApkConfig {
 
     const val MIN_SDK_VERSION = 26
 
-    const val TARGET_SDK_VERSION = 35
-    const val COMPILE_SDK_VERSION = 35
+    const val TARGET_SDK_VERSION = 36
+    const val COMPILE_SDK_VERSION = 36
     const val ROBOELECTRIC_SDK_VERSION = 34
 
     private const val DEBUG_VERSION = "DEBUG_VERSION"

components/filemngr/upload/impl/build.gradle.kts

@@ -67,6 +67,10 @@ commonDependencies {
     implementation(libs.kotlin.immutable.collections)
 }
 
+androidDependencies {
+    implementation(libs.compose.activity)
+}
+
 commonTestDependencies {
     implementation(projects.components.core.test)
     implementation(libs.junit)

components/remote-controls/grid/remote/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/remote/composable/components/RemoteGridComposableContent.kt

@@ -27,7 +27,7 @@ internal fun RemoteGridComposableContent(
         targetState = model,
         modifier = modifier,
         transitionSpec = { fadeIn().togetherWith(fadeOut()) },
-        contentKey = { model.contentKey }
+        contentKey = { it.contentKey }
     ) { animatedModel ->
         when (animatedModel) {
             is RemoteGridComponent.Model.Error -> {

components/remote-controls/grid/saved/impl/src/main/kotlin/com/flipperdevices/remotecontrols/impl/grid/local/composable/components/LocalGridComposableContent.kt

@@ -37,7 +37,7 @@ internal fun LocalGridComposableContent(
         targetState = model,
         modifier = modifier,
         transitionSpec = { fadeIn().togetherWith(fadeOut()) },
-        contentKey = { model.contentKey }
+        contentKey = { it.contentKey }
     ) { animatedModel ->
         when (animatedModel) {
             // We leave screen on error

components/wearable/sync/wear/impl/src/main/java/com/flipperdevices/wearable/sync/wear/impl/viewmodel/KeysListViewModel.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Intent
 import android.net.Uri
+import androidx.concurrent.futures.await
 import androidx.wear.phone.interactions.PhoneTypeHelper
 import androidx.wear.remote.interactions.RemoteActivityHelper
 import androidx.wear.widget.ConfirmationOverlay
@@ -33,7 +34,6 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.guava.await
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import javax.inject.Inject