all: update to Compose alpha08 and Kotlin 1.4.20

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-12-03 01:53:31 +05:30
parent 6597f0058d
commit f8b8ce0b5b
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
7 changed files with 16 additions and 16 deletions

View file

@ -4,7 +4,7 @@ plugins {
id("com.android.application") id("com.android.application")
kotlin("android") kotlin("android")
kotlin("kapt") kotlin("kapt")
kotlin("plugin.serialization") version "1.4.10" kotlin("plugin.serialization") version "1.4.20"
id("dagger.hilt.android.plugin") id("dagger.hilt.android.plugin")
`lobsters-plugin` `lobsters-plugin`
`core-library-desugaring` `core-library-desugaring`
@ -34,7 +34,7 @@ android {
buildFeatures.compose = true buildFeatures.compose = true
composeOptions { composeOptions {
kotlinCompilerVersion = "1.4.10" kotlinCompilerVersion = "1.4.20"
kotlinCompilerExtensionVersion = Dependencies.COMPOSE_VERSION kotlinCompilerExtensionVersion = Dependencies.COMPOSE_VERSION
} }

View file

@ -1,4 +1,4 @@
-keepattributes *Annotation*, InnerClasses -keepattributes *Annotation*, EnclosingMethod, InnerClasses
-dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations -dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations
-keep,includedescriptorclasses class dev.msfjarvis.lobsters.model.**$$serializer { *; } -keep,includedescriptorclasses class dev.msfjarvis.lobsters.model.**$$serializer { *; }

View file

@ -12,13 +12,13 @@ import androidx.compose.foundation.lazy.LazyColumnFor
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Surface import androidx.compose.material.Surface
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.material.ripple.RippleIndication import androidx.compose.material.ripple.rememberRippleIndication
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.ui.tooling.preview.Preview
import coil.transform.CircleCropTransformation import coil.transform.CircleCropTransformation
import dev.chrisbanes.accompanist.coil.CoilImage import dev.chrisbanes.accompanist.coil.CoilImage
import dev.msfjarvis.lobsters.R import dev.msfjarvis.lobsters.R
@ -113,7 +113,7 @@ fun LobstersItem(
modifier = Modifier.padding(8.dp) modifier = Modifier.padding(8.dp)
.clickable( .clickable(
onClick = onSaveButtonClick, onClick = onSaveButtonClick,
indication = RippleIndication(), indication = rememberRippleIndication(),
) )
.constrainAs(saveButton) { .constrainAs(saveButton) {
end.linkTo(parent.end) end.linkTo(parent.end)

View file

@ -31,8 +31,8 @@ fun IconResource(
tint: Color = AmbientContentColor.current tint: Color = AmbientContentColor.current
) { ) {
val deferredResource = loadVectorResource(resourceId) val deferredResource = loadVectorResource(resourceId)
deferredResource.onLoadRun { asset -> deferredResource.onLoadRun { vector ->
Icon(asset = asset, modifier = modifier, tint = tint) Icon(imageVector = vector, modifier = modifier, tint = tint)
} }
} }

View file

@ -1,7 +1,7 @@
rootProject.ext.versions = [ rootProject.ext.versions = [
agp: '7.0.0-alpha01', agp: '7.0.0-alpha01',
daggerHilt: '2.30.1-alpha', daggerHilt: '2.30.1-alpha',
kotlin: '1.4.10', kotlin: '1.4.20',
lint: '27.3.0-alpha01', lint: '27.3.0-alpha01',
] ]

View file

@ -7,7 +7,7 @@ private const val ANDROIDX_HILT_VERSION = "1.0.0-alpha02"
private const val DAGGER_HILT_VERSION = "2.30.1-alpha" private const val DAGGER_HILT_VERSION = "2.30.1-alpha"
object Dependencies { object Dependencies {
const val COMPOSE_VERSION = "1.0.0-alpha07" const val COMPOSE_VERSION = "1.0.0-alpha08"
object Kotlin { object Kotlin {
object Coroutines { object Coroutines {
@ -19,7 +19,7 @@ object Dependencies {
object Ktor { object Ktor {
private const val version = "1.4.1" private const val version = "1.4.2"
const val clientCore = "io.ktor:ktor-client-core:$version" const val clientCore = "io.ktor:ktor-client-core:$version"
const val clientJson = "io.ktor:ktor-client-json:$version" const val clientJson = "io.ktor:ktor-client-json:$version"
const val clientSerialization = "io.ktor:ktor-client-serialization:$version" const val clientSerialization = "io.ktor:ktor-client-serialization:$version"
@ -38,7 +38,7 @@ object Dependencies {
const val activityKtx = "androidx.activity:activity-ktx:1.2.0-beta01" const val activityKtx = "androidx.activity:activity-ktx:1.2.0-beta01"
const val appCompat = "androidx.appcompat:appcompat:1.3.0-alpha02" const val appCompat = "androidx.appcompat:appcompat:1.3.0-alpha02"
const val browser = "androidx.browser:browser:1.3.0-rc01" const val browser = "androidx.browser:browser:1.3.0"
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha05" const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha05"
const val coreLibraryDesugaring = "com.android.tools:desugar_jdk_libs:1.0.10" const val coreLibraryDesugaring = "com.android.tools:desugar_jdk_libs:1.0.10"
const val material = "com.google.android.material:material:1.3.0-alpha04" const val material = "com.google.android.material:material:1.3.0-alpha04"
@ -49,11 +49,11 @@ object Dependencies {
const val foundation = "androidx.compose.foundation:foundation:$COMPOSE_VERSION" const val foundation = "androidx.compose.foundation:foundation:$COMPOSE_VERSION"
const val foundationLayout = "androidx.compose.foundation:foundation-layout:$COMPOSE_VERSION" const val foundationLayout = "androidx.compose.foundation:foundation-layout:$COMPOSE_VERSION"
const val material = "androidx.compose.material:material:$COMPOSE_VERSION" const val material = "androidx.compose.material:material:$COMPOSE_VERSION"
const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha02" const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha03"
const val runtime = "androidx.compose.runtime:runtime:$COMPOSE_VERSION" const val runtime = "androidx.compose.runtime:runtime:$COMPOSE_VERSION"
const val ui = "androidx.compose.ui:ui:$COMPOSE_VERSION" const val ui = "androidx.compose.ui:ui:$COMPOSE_VERSION"
const val uiUnit = "androidx.compose.ui:ui-unit:$COMPOSE_VERSION" const val uiUnit = "androidx.compose.ui:ui-unit:$COMPOSE_VERSION"
const val uiTooling = "androidx.ui:ui-tooling:$COMPOSE_VERSION" const val uiTooling = "androidx.compose.ui:ui-tooling:$COMPOSE_VERSION"
} }
object Hilt { object Hilt {
@ -82,7 +82,7 @@ object Dependencies {
object ThirdParty { object ThirdParty {
const val accompanist = "dev.chrisbanes.accompanist:accompanist-coil:0.3.3.1" const val accompanist = "dev.chrisbanes.accompanist:accompanist-coil:0.4.0"
const val customtabs = "saschpe.android:customtabs:3.0.2" const val customtabs = "saschpe.android:customtabs:3.0.2"
object Roomigrant { object Roomigrant {

View file

@ -1,7 +1,7 @@
plugins { plugins {
id("com.android.library") id("com.android.library")
kotlin("android") kotlin("android")
kotlin("plugin.serialization") version "1.4.10" kotlin("plugin.serialization") version "1.4.20"
`lobsters-plugin` `lobsters-plugin`
} }