Compose 1.0.1 (#221)

* update to compose 1.0.1 / kt 1.5.21 * update
instacart · Aug 25, 2021 · b6e8bb5 · b6e8bb5
1 parent 63f6243
commit b6e8bb5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,14 +3,14 @@ apply plugin: "com.github.ben-manes.versions"
 
 buildscript {
     ext {
-        kotlinVersion = '1.5.10'
+        kotlinVersion = '1.5.21'
 
         versions = [:]
         libraries = [:]
         constants = [
                 minSdk      : 21,
-                targetSdk   : 29,
-                compileSdk  : 29
+                targetSdk   : 30,
+                compileSdk  : 30
         ]
     }
 

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,5 +1,5 @@
 ext {
-    androidXVersion = '1.1.0'
+    androidXVersion = '1.2.0'
     androidTestVersion = "1.1.0"
     androidJUnitVersion = "1.1.0"
     lifecycleVersion = '2.0.0'
@@ -11,21 +11,20 @@ ext {
     okhttpVersion = "3.13.1"
     robolectricVersion = "4.1" // be aware of updating https://github.com/robolectric/robolectric/pull/4736
     truthVersion = "1.0.1"
-    composeVersion = "1.0.0-beta08"
+    composeVersion = "1.0.1"
 
     libraries = [
             androidx             : [
                     annotation      : "androidx.annotation:annotation:$androidXVersion",
-                    appcompat       : "androidx.appcompat:appcompat:1.3.0",
+                    appcompat       : "androidx.appcompat:appcompat:1.3.1",
                     browser         : "androidx.browser:browser:$androidXVersion",
                     core            : [
-                            ktx: "androidx.core:core-ktx:1.2.0"
+                            ktx: "androidx.core:core-ktx:1.6.0"
                     ],
                     activity        : [
-                            compose : "androidx.activity:activity-compose:1.3.0-alpha05"
+                            compose : "androidx.activity:activity-compose:1.3.1"
                     ],
                     compose         : [
-                            activity    : "androidx.activity:activity-compose:1.3.0-alpha05",
                             foundation  : "androidx.compose.foundation:foundation:$composeVersion",
                             material    : "androidx.compose.material:material:$composeVersion",
                             rxjava3     : "androidx.compose.runtime:runtime-rxjava3:$composeVersion",

diff --git a/formula-android-compose/build.gradle b/formula-android-compose/build.gradle
@@ -27,9 +27,10 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion "1.5.10"
-        kotlinCompilerExtensionVersion "1.0.0-beta08"
+        kotlinCompilerVersion constants.kotlinVersion
+        kotlinCompilerExtensionVersion composeVersion
     }
+
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {

diff --git a/samples/stopwatch-compose/build.gradle b/samples/stopwatch-compose/build.gradle
@@ -30,8 +30,8 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion "1.5.10"
-        kotlinCompilerExtensionVersion "1.0.0-beta08"
+        kotlinCompilerVersion constants.kotlinVersion
+        kotlinCompilerExtensionVersion composeVersion
     }
 
     buildTypes {