Update to Compose dev16 (#8)

* Update to Compose dev16
* Update AGP to 4.2.0-alpha07
* compileSdk is now 30
* Fix MdcThemeTest when running in system dark theme
* Update Spotless to 5.1.1
* Update README

Author: chrisbanes

.idea/codeStyles/Project.xml

@@ -2,7 +2,7 @@
 
 A library that enables reuse of [Material Components for Android][mdc] XML themes for theming in [Jetpack Compose][compose].
 
-The basis of theming in Jetpack Compose is the [`MaterialTheme`][materialtheme] composable, where you provide [`ColorPalette`](https://developer.android.com/reference/kotlin/androidx/ui/material/ColorPalette), [`Shapes`](https://developer.android.com/reference/kotlin/androidx/ui/material/Shapes) and [`Typography`](https://developer.android.com/reference/kotlin/androidx/ui/material/Typography) instances containing your styling parameters:
+The basis of theming in [Jetpack Compose][compose] is the [`MaterialTheme`][materialtheme] composable, where you provide [`Colors`][colors], [`Shapes`][shapes] and [`Typography`][typography] instances containing your styling parameters:
 
 ``` kotlin
 MaterialTheme(
@@ -31,7 +31,7 @@ MaterialTheme(
 </style>
 ```
 
-This library attempts to bridge the gap between [Material Components for Android][mdc] XML themes, and themes in [Jetpack Compose][compose], allowing your composable `MaterialTheme` to be based on the `Activity`'s XML theme:
+This library attempts to bridge the gap between [Material Components for Android][mdc] XML themes, and themes in [Jetpack Compose][compose], allowing your composable [`MaterialTheme`][materialtheme] to be based on the `Activity`'s XML theme:
 
 
 ``` kotlin
@@ -120,5 +120,7 @@ limitations under the License.
 
  [compose]: https://developer.android.com/jetpack/compose
  [mdc]: https://material.io/develop/android/
- [materialtheme]: https://developer.android.com/reference/kotlin/androidx/ui/material/MaterialTheme
- [shapes]: https://developer.android.com/reference/kotlin/androidx/ui/material/Shapes
+ [materialtheme]: https://developer.android.com/reference/kotlin/androidx/compose/material/MaterialTheme
+ [shapes]: https://developer.android.com/reference/kotlin/androidx/compose/material/Shapes
+ [colors]: https://developer.android.com/reference/kotlin/androidx/compose/material/Colors
+ [typography]: https://developer.android.com/reference/kotlin/androidx/compose/material/Typography

.idea/codeStyles/codeStyleConfig.xml

@@ -20,6 +20,7 @@ import com.google.android.material.composethemeadapter.Versions
 buildscript {
     repositories {
         google()
+        mavenCentral()
         jcenter()
     }
 
@@ -32,7 +33,7 @@ buildscript {
 }
 
 plugins {
-    id "com.diffplug.gradle.spotless" version "4.3.0"
+    id "com.diffplug.spotless" version "5.1.1"
 }
 
 subprojects {
@@ -48,7 +49,7 @@ subprojects {
         }
     }
 
-    apply plugin: 'com.diffplug.gradle.spotless'
+    apply plugin: 'com.diffplug.spotless'
     spotless {
         kotlin {
             target "**/*.kt"
@@ -68,15 +69,7 @@ subprojects {
             // Allow use of @OptIn
             freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
 
-            // Compose is now based on the Kotlin 1.4 compiler, but we need to use the 1.3.x Kotlin
-            // library due to library compatibility, etc. Therefore we explicit set our apiVersion
-            // to 1.3 to fix any warnings. Binary dependencies (such as Compose) can continue to
-            // use 1.4 if built with that library
-            apiVersion = "1.3"
-
-            // Don't require parens on fun type annotations e.g. `@Composable~()~ () -> Unit`
-            // TODO: Remove when we move to Kotlin 1.4
-            freeCompilerArgs += "-XXLanguage:+NonParenthesizedAnnotationsOnFunctionalTypes"
+            freeCompilerArgs += "-Xallow-jvm-ir-dependencies"
         }
     }
 }

README.md

@@ -21,30 +21,32 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha05"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha07"
 
     const val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.12.0"
 
     const val mdc = "com.google.android.material:material:1.1.0"
 
     object Kotlin {
-        private const val version = "1.3.72"
+        const val version = "1.4.0-rc"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
     }
 
     object AndroidX {
         object Compose {
             const val snapshot = ""
-            const val version = "0.1.0-dev14"
-            const val kotlinCompilerVersion = "1.3.70-dev-withExperimentalGoogleExtensions-20200424"
+            const val version = "0.1.0-dev16"
 
-            const val runtime = "androidx.compose:compose-runtime:$version"
+            const val runtime = "androidx.compose.runtime:runtime:$version"
+            const val foundation = "androidx.compose.foundation:foundation:${version}"
+            const val layout = "androidx.compose.foundation:foundation-layout:${version}"
 
-            const val layout = "androidx.ui:ui-layout:$version"
-            const val material = "androidx.ui:ui-material:$version"
+            const val ui = "androidx.compose.ui:ui:${version}"
+            const val material = "androidx.compose.material:material:${version}"
 
-            const val test = "androidx.ui:ui-test:$version"
+            const val tooling = "androidx.ui:ui-tooling:${version}"
+            const val test = "androidx.ui:ui-test:${version}"
         }
 
         const val coreKtx = "androidx.core:core-ktx:1.2.0"

build.gradle

@@ -38,7 +38,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion Libs.AndroidX.Compose.kotlinCompilerVersion
+        kotlinCompilerVersion Libs.Kotlin.version
         kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
     }
 

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

@@ -16,23 +16,24 @@
 
 package com.google.android.material.composethemeadapter
 
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.shape.CornerSize
+import androidx.compose.foundation.shape.CutCornerShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.platform.DensityAmbient
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.font.font
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.em
+import androidx.compose.ui.unit.sp
 import androidx.test.filters.MediumTest
-import androidx.ui.core.DensityAmbient
-import androidx.ui.foundation.shape.corner.CornerSize
-import androidx.ui.foundation.shape.corner.CutCornerShape
-import androidx.ui.foundation.shape.corner.RoundedCornerShape
-import androidx.ui.geometry.Size
-import androidx.ui.material.MaterialTheme
-import androidx.ui.res.colorResource
-import androidx.ui.test.android.AndroidComposeTestRule
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.font.font
-import androidx.ui.unit.Density
-import androidx.ui.unit.Dp
-import androidx.ui.unit.TextUnit
-import androidx.ui.unit.dp
-import androidx.ui.unit.em
-import androidx.ui.unit.sp
+import androidx.ui.test.android.createAndroidComposeRule
 import com.google.android.material.composethemeadapter.test.R
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
@@ -47,7 +48,7 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class MdcThemeTest {
     @get:Rule
-    val composeTestRule = AndroidComposeTestRule<MdcActivity>()
+    val composeTestRule = createAndroidComposeRule<MdcActivity>()
 
     @Test
     fun colors() = composeTestRule.setContent {
@@ -59,8 +60,13 @@ class MdcThemeTest {
             assertEquals(colorResource(R.color.midnight_blue), color.onPrimary)
 
             assertEquals(colorResource(R.color.dark_golden_rod), color.secondary)
-            assertEquals(colorResource(R.color.blue_violet), color.secondaryVariant)
             assertEquals(colorResource(R.color.slate_gray), color.onSecondary)
+            if (!isSystemInDarkTheme()) {
+                assertEquals(colorResource(R.color.blue_violet), color.secondaryVariant)
+            } else {
+                // In dark theme secondaryVariant is ignored and always return secondary
+                assertEquals(colorResource(R.color.dark_golden_rod), color.secondaryVariant)
+            }
 
             assertEquals(colorResource(R.color.spring_green), color.surface)
             assertEquals(colorResource(R.color.navy), color.onSurface)
@@ -158,4 +164,4 @@ private fun assertTextUnitEquals(expected: TextUnit, actual: TextUnit, density:
     }
 }
 
-private fun CornerSize.toPx(density: Density) = toPx(Size.UnspecifiedSize, density)
+private fun CornerSize.toPx(density: Density) = toPx(Size.Unspecified, density)

lib/build.gradle

@@ -17,7 +17,7 @@
 package com.google.android.material.composethemeadapter
 
 import androidx.test.filters.MediumTest
-import androidx.ui.test.android.AndroidComposeTestRule
+import androidx.ui.test.android.createAndroidComposeRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -27,7 +27,7 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class NotMdcThemeTest {
     @get:Rule
-    val composeTestRule = AndroidComposeTestRule<NotMdcActivity>()
+    val composeTestRule = createAndroidComposeRule<NotMdcActivity>()
 
     @Test(expected = IllegalArgumentException::class)
     fun throwForNonMdcTheme() = composeTestRule.setContent {