diff --git a/examples/imageviewer/settings.gradle.kts b/examples/imageviewer/settings.gradle.kts index 369d84150a..53ae60fa60 100755 --- a/examples/imageviewer/settings.gradle.kts +++ b/examples/imageviewer/settings.gradle.kts @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-build63") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev85") classpath("com.android.tools.build:gradle:4.0.1") classpath(kotlin("gradle-plugin", version = "1.4.0")) } diff --git a/examples/issues/common/src/commonMain/kotlin/androidx/ui/examples/jetissues/view/JetIssuesView.kt b/examples/issues/common/src/commonMain/kotlin/androidx/ui/examples/jetissues/view/JetIssuesView.kt index a7f5d0af99..77dac9fe88 100644 --- a/examples/issues/common/src/commonMain/kotlin/androidx/ui/examples/jetissues/view/JetIssuesView.kt +++ b/examples/issues/common/src/commonMain/kotlin/androidx/ui/examples/jetissues/view/JetIssuesView.kt @@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.* import androidx.compose.runtime.* +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.WithConstraints import androidx.compose.ui.graphics.Color @@ -105,7 +106,7 @@ fun SingleColumnLayout(currentIssue: MutableState) { @Composable fun TwoColumnsLayout(currentIssue: MutableState) { Row(Modifier.fillMaxSize()) { - Box(modifier = Modifier.fillMaxWidth(0.4f)) { + Box(modifier = Modifier.fillMaxWidth(0.4f), alignment = Alignment.Center) { IssuesList(currentIssue) } CurrentIssue(currentIssue.value) @@ -253,7 +254,7 @@ fun ListBody( for (iss in it.data.nodes) { Box(modifier = Modifier.clickable { currentIssue.value = iss - }) { + }, alignment = Alignment.CenterStart) { ListItem(iss) } } diff --git a/examples/issues/local.properties b/examples/issues/local.properties deleted file mode 100644 index 2cfc19d40d..0000000000 --- a/examples/issues/local.properties +++ /dev/null @@ -1,8 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Sat Aug 22 13:16:28 CEST 2020 -sdk.dir=/Users/prepor/repos/androidx/prebuilts/fullsdk-darwin diff --git a/examples/issues/settings.gradle.kts b/examples/issues/settings.gradle.kts index 369d84150a..53ae60fa60 100644 --- a/examples/issues/settings.gradle.kts +++ b/examples/issues/settings.gradle.kts @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-build63") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.1.0-dev85") classpath("com.android.tools.build:gradle:4.0.1") classpath(kotlin("gradle-plugin", version = "1.4.0")) } diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index d07668b323..da6529dc98 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/templates/desktop-template/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.compose.compose plugins { kotlin("jvm") version "1.4.0" - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-build63") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev85") application } diff --git a/templates/multiplatform-template/settings.gradle.kts b/templates/multiplatform-template/settings.gradle.kts index 82d6773022..c6fb6fc2b5 100644 --- a/templates/multiplatform-template/settings.gradle.kts +++ b/templates/multiplatform-template/settings.gradle.kts @@ -1,5 +1,5 @@ buildscript { - val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-build63" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.1.0-dev85" repositories { google()