| commit | 6a058755debbd025ac7284f59a291df520434716 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <[email protected]> | Wed May 10 15:03:57 2023 -0700 |
| committer | Aurimas Liutikas <[email protected]> | Thu May 11 16:08:18 2023 -0700 |
| tree | 5f8648f82ee792d912657d224268bc4b6f2587b0 | |
| parent | 058109a2a723718cc5740e241cccf418087784a8 [diff] |
Move glance away from Compose multiplatform setup These are just regular Android libraries, move them to use Kotlin Gradle plugin directly with appropriate directory structure (src/main, src/androidTest). Test: ./gradlew glance:glance:assembleAndroidTest Change-Id: Ia918309f23d0916f01010f542caf053bd268bcb4
diff --git a/glance/glance-preview/build.gradle b/glance/glance-preview/build.gradle index 0857b2ee..f6be751 100644 --- a/glance/glance-preview/build.gradle +++ b/glance/glance-preview/build.gradle
@@ -1,15 +1,12 @@ -import androidx.build.AndroidXComposePlugin import androidx.build.LibraryType plugins { id("AndroidXComposePlugin") id("AndroidXPlugin") + id("org.jetbrains.kotlin.android") id("com.android.library") } -// Disable multi-platform; this will only be used on Android. -AndroidXComposePlugin.applyAndConfigureKotlinPlugin(project, /* isMultiplatformEnabled= */false) - dependencies { implementation(libs.kotlinStdlib) api("androidx.annotation:annotation:1.4.0")
diff --git a/glance/glance-preview/src/androidMain/kotlin/androidx/glance/preview/ExperimentalGlancePreviewApi.kt b/glance/glance-preview/src/main/java/androidx/glance/preview/ExperimentalGlancePreviewApi.kt similarity index 100% rename from glance/glance-preview/src/androidMain/kotlin/androidx/glance/preview/ExperimentalGlancePreviewApi.kt rename to glance/glance-preview/src/main/java/androidx/glance/preview/ExperimentalGlancePreviewApi.kt
diff --git a/glance/glance-preview/src/androidMain/kotlin/androidx/glance/preview/GlancePreview.kt b/glance/glance-preview/src/main/java/androidx/glance/preview/GlancePreview.kt similarity index 100% rename from glance/glance-preview/src/androidMain/kotlin/androidx/glance/preview/GlancePreview.kt rename to glance/glance-preview/src/main/java/androidx/glance/preview/GlancePreview.kt
diff --git a/glance/glance-preview/src/androidMain/kotlin/androidx/glance/preview/Surface.kt b/glance/glance-preview/src/main/java/androidx/glance/preview/Surface.kt similarity index 100% rename from glance/glance-preview/src/androidMain/kotlin/androidx/glance/preview/Surface.kt rename to glance/glance-preview/src/main/java/androidx/glance/preview/Surface.kt