Merge branch 'github/main'

pull/836/head
Automerger 2 years ago
commit 03286eac13

@ -32,7 +32,6 @@ class UserPreferencesSerializer @Inject constructor() : Serializer<UserPreferenc
override suspend fun readFrom(input: InputStream): UserPreferences = override suspend fun readFrom(input: InputStream): UserPreferences =
try { try {
// readFrom is already called on the data store background thread // readFrom is already called on the data store background thread
@Suppress("BlockingMethodInNonBlockingContext")
UserPreferences.parseFrom(input) UserPreferences.parseFrom(input)
} catch (exception: InvalidProtocolBufferException) { } catch (exception: InvalidProtocolBufferException) {
throw CorruptionException("Cannot read proto.", exception) throw CorruptionException("Cannot read proto.", exception)
@ -40,7 +39,6 @@ class UserPreferencesSerializer @Inject constructor() : Serializer<UserPreferenc
override suspend fun writeTo(t: UserPreferences, output: OutputStream) { override suspend fun writeTo(t: UserPreferences, output: OutputStream) {
// writeTo is already called on the data store background thread // writeTo is already called on the data store background thread
@Suppress("BlockingMethodInNonBlockingContext")
t.writeTo(output) t.writeTo(output)
} }
} }

@ -40,7 +40,6 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
@ -83,7 +82,6 @@ fun SettingsDialog(
) )
} }
@OptIn(ExperimentalComposeUiApi::class)
@Composable @Composable
fun SettingsDialog( fun SettingsDialog(
settingsUiState: SettingsUiState, settingsUiState: SettingsUiState,

@ -32,7 +32,6 @@ import org.jetbrains.uast.UQualifiedReferenceExpression
* A detector that checks for incorrect usages of Compose Material APIs over equivalents in * A detector that checks for incorrect usages of Compose Material APIs over equivalents in
* the Now in Android design system module. * the Now in Android design system module.
*/ */
@Suppress("UnstableApiUsage")
class DesignSystemDetector : Detector(), Detector.UastScanner { class DesignSystemDetector : Detector(), Detector.UastScanner {
override fun getApplicableUastTypes(): List<Class<out UElement>> { override fun getApplicableUastTypes(): List<Class<out UElement>> {

@ -24,7 +24,6 @@ import com.android.tools.lint.detector.api.CURRENT_API
* An issue registry that checks for incorrect usages of Compose Material APIs over equivalents in * An issue registry that checks for incorrect usages of Compose Material APIs over equivalents in
* the Now in Android design system module. * the Now in Android design system module.
*/ */
@Suppress("UnstableApiUsage")
class DesignSystemIssueRegistry : IssueRegistry() { class DesignSystemIssueRegistry : IssueRegistry() {
override val issues = listOf(DesignSystemDetector.ISSUE) override val issues = listOf(DesignSystemDetector.ISSUE)

Loading…
Cancel
Save