diff --git a/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt b/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt index 73c0f126..c9301983 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt @@ -17,7 +17,7 @@ package dev.msfjarvis.lobsters.compose.utils import androidx.annotation.DrawableRes import androidx.compose.foundation.Icon -import androidx.compose.foundation.contentColor +import androidx.compose.foundation.AmbientContentColor import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -28,7 +28,7 @@ import androidx.compose.ui.res.loadVectorResource fun IconResource( @DrawableRes resourceId: Int, modifier: Modifier = Modifier, - tint: Color = contentColor() + tint: Color = AmbientContentColor.current ) { val deferredResource = loadVectorResource(resourceId) deferredResource.onLoadRun { asset -> diff --git a/build.gradle b/build.gradle index e776bfde..9eda9d31 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { agp_version = "4.2.0-alpha13" appcompat_version = "1.3.0-alpha02" browser_version = "1.3.0-alpha06" - compose_version = "1.0.0-alpha04" + compose_version = "1.0.0-alpha05" core_version = "1.5.0-alpha04" coroutines_version = "1.3.9" customtabs_version = "3.0.2" @@ -21,7 +21,7 @@ buildscript { moshi_version = "1.9.3" okhttp_version = "3.14.9" retrofit_version = "2.9.0" - room_version = "2.3.0-alpha02" + room_version = "2.3.0-alpha03" } repositories { google() diff --git a/gradle.properties b/gradle.properties index 60903229..bc6a197f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,3 +44,6 @@ android.defaults.buildfeatures.aidl=false android.defaults.buildfeatures.renderscript=false android.defaults.buildfeatures.resvalues=false android.defaults.buildfeatures.shaders=false + +# Disable warnings about unsupported features, we know what we're doing +android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.suppressUnsupportedOptionWarnings