Merge pull request #35 from ricknout/develop

Update Compose to 1.0.0-alpha07

Author: ricknout

build.gradle

@@ -96,7 +96,7 @@ subprojects {
                 }
                 externalDocumentationLink {
                     url = new URL("https://developer.android.com/reference/kotlin/")
-                    packageListUrl = new URL("https://developer.android.com/reference/kotlin/androidx/ui/package-list")
+                    packageListUrl = new URL("https://developer.android.com/reference/kotlin/androidx/package-list")
                 }
                 externalDocumentationLink {
                     url = new URL("https://developer.android.com/reference/")

buildSrc/src/main/java/com/google/android/material/composethemeadapter/dependencies.kt

@@ -28,7 +28,7 @@ object Libs {
     const val mdc = "com.google.android.material:material:1.1.0"
 
     object Kotlin {
-        const val version = "1.4.0"
+        const val version = "1.4.10"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
 
@@ -47,7 +47,7 @@ object Libs {
             val snapshotUrl: String
                 get() = "https://androidx.dev/snapshots/builds/$snapshot/artifacts/ui/repository/"
 
-            private const val version = "1.0.0-alpha06"
+            private const val version = "1.0.0-alpha07"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val foundation = "androidx.compose.foundation:foundation:${version}"
@@ -57,7 +57,7 @@ object Libs {
             const val material = "androidx.compose.material:material:${version}"
 
             const val tooling = "androidx.ui:ui-tooling:${version}"
-            const val test = "androidx.ui:ui-test:${version}"
+            const val test = "androidx.compose.ui:ui-test-junit4:${version}"
         }
 
         const val coreKtx = "androidx.core:core-ktx:1.3.1"

lib/api/lib.api

@@ -5,6 +5,7 @@ public final class com/google/android/material/composethemeadapter/MdcTheme {
 }
 
 public final class com/google/android/material/composethemeadapter/ThemeParameters {
+	public static final field $stable I
 	public fun <init> (Landroidx/compose/material/Colors;Landroidx/compose/material/Typography;Landroidx/compose/material/Shapes;)V
 	public final fun component1 ()Landroidx/compose/material/Colors;
 	public final fun component2 ()Landroidx/compose/material/Typography;

lib/build.gradle

@@ -51,6 +51,13 @@ android {
         // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks
         checkReleaseBuilds false
     }
+
+    packagingOptions {
+        // Multiple dependencies bring these files in. Exclude them to enable
+        // our test APK to build (has no effect on our AARs)
+        excludes += "/META-INF/AL2.0"
+        excludes += "/META-INF/LGPL2.1"
+    }
 }
 
 afterEvaluate {

lib/src/androidTest/java/com/google/android/material/composethemeadapter/MdcThemeTest.kt

@@ -25,6 +25,7 @@ import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.platform.ContextAmbient
 import androidx.compose.ui.platform.DensityAmbient
 import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.font.asFontFamily
@@ -37,7 +38,6 @@ import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.filters.MediumTest
-import androidx.ui.test.AndroidComposeTestRule
 import com.google.android.material.composethemeadapter.test.R
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull

lib/src/androidTest/java/com/google/android/material/composethemeadapter/NotMdcThemeTest.kt

@@ -16,8 +16,8 @@
 
 package com.google.android.material.composethemeadapter
 
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.test.filters.MediumTest
-import androidx.ui.test.createAndroidComposeRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

sample/src/main/java/com/google/android/material/composethemeadapter/sample/BasicIntegration.kt

@@ -20,7 +20,6 @@ import android.os.Bundle
 import android.widget.FrameLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.ScrollableColumn
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
@@ -33,6 +32,7 @@ import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedButton
 import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
 import androidx.compose.material.TextButton
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons