Upgrade compose to latest beta, 07 in compose project.

Also upgrades kotlin version in compose project to 1.4.32.
square · May 19, 2021 · 39190a6 · 39190a6
1 parent 354eb5b
commit 39190a6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/compose/.buildscript/configure-compose.gradle b/compose/.buildscript/configure-compose.gradle
@@ -19,7 +19,6 @@ android {
     compose true
   }
   composeOptions {
-    kotlinCompilerVersion Versions.kotlin
     kotlinCompilerExtensionVersion Versions.compose
   }
 }
diff --git a/compose/README.md b/compose/README.md
@@ -48,7 +48,6 @@ android {
     compose true
   }
   composeOptions {
-    kotlinCompilerVersion "1.4.0-dev-withExperimentalGoogleExtensions-20200720"
     kotlinCompilerExtensionVersion "${compose_version}"
   }
 }

diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -73,7 +73,6 @@ subprojects {
       // https://developer.android.com/jetpack/androidx/releases/compose-runtime
       freeCompilerArgs += listOf(
         "-Xopt-in=kotlin.RequiresOptIn",
-        "-Xallow-jvm-ir-dependencies",
         "-Xskip-prerelease-check"
       )
 

diff --git a/compose/buildSrc/src/main/java/Dependencies.kt b/compose/buildSrc/src/main/java/Dependencies.kt
@@ -19,8 +19,8 @@ import java.util.Locale.US
 import kotlin.reflect.full.declaredMembers
 
 object Versions {
-  const val compose = "1.0.0-beta02"
-  const val kotlin = "1.4.31"
+  const val compose = "1.0.0-beta07"
+  const val kotlin = "1.4.32"
 
   // This *is* actually used.
   @Suppress("unused")

diff --git a/compose/compose-tooling/src/androidTest/AndroidManifest.xml b/compose/compose-tooling/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.squareup.workflow.ui.compose.tooling.test">
+
+  <application>
+    <!--  Required for createComposeRule.  -->
+    <activity
+        android:name="androidx.activity.ComponentActivity"
+        android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen" />
+  </application>
+</manifest>
diff --git a/compose/core-compose/src/androidTest/AndroidManifest.xml b/compose/core-compose/src/androidTest/AndroidManifest.xml
@@ -19,7 +19,7 @@
   <application>
     <!--  Required for createComposeRule.  -->
     <activity
-        android:name="android.app.Activity"
+        android:name="androidx.activity.ComponentActivity"
         android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen" />
   </application>
 </manifest>