Update to compose alpha 11 (#190)

* Update to compose alpha 11 * Replace scrollable column only with column * Update compose version
pedrovgs · Feb 2, 2021 · 1e14b17 · 1e14b17
1 parent 2b12b32
commit 1e14b17
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/shot-android/build.gradle b/shot-android/build.gradle
@@ -47,7 +47,7 @@ dependencies {
     implementation "androidx.test:runner:1.3.0"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.test.espresso:espresso-core:3.3.0"
-    implementation "androidx.compose.ui:ui-test-junit4:1.0.0-alpha10"
+    implementation "androidx.compose.ui:ui-test-junit4:1.0.0-alpha11"
     implementation "com.google.code.gson:gson:2.8.6"
 
     testImplementation "junit:junit:4.13"

diff --git a/shot-consumer-compose/app/src/main/java/com/karumi/shotconsumercompose/MainActivity.kt b/shot-consumer-compose/app/src/main/java/com/karumi/shotconsumercompose/MainActivity.kt
@@ -7,11 +7,11 @@ import androidx.compose.ui.platform.setContent
 import com.karumi.shotconsumercompose.ui.ShotConsumerComposeTheme
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.ui.unit.dp
-import androidx.compose.foundation.ScrollableColumn
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.Text
 import androidx.compose.ui.tooling.preview.Preview
 
@@ -21,7 +21,7 @@ class MainActivity : AppCompatActivity() {
         setContent {
             ShotConsumerComposeTheme {
                 // A surface container using the 'background' color from the theme
-                ScrollableColumn {
+                Column {
                     Greeting("Android")
                     RoundedCornersBox()
                 }

diff --git a/shot-consumer-compose/build.gradle b/shot-consumer-compose/build.gradle
@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        compose_version = '1.0.0-alpha10'
+        compose_version = '1.0.0-alpha11'
     }
-    ext.kotlin_version = "1.4.21"
+    ext.kotlin_version = "1.4.21-2"
     repositories {
         google()
         jcenter()
         maven { url uri('../repo') }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.0-alpha04"
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha05'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.karumi:shot:5.6.1-SNAPSHOT"
     }