Skip to content

Upgrade Compose to 1.0.0-alpha09.#117

Merged
zach-klippenstein merged 1 commit intomainfrom
zachklipp/upgrade-compose
Jan 8, 2021
Merged

Upgrade Compose to 1.0.0-alpha09.#117
zach-klippenstein merged 1 commit intomainfrom
zachklipp/upgrade-compose

Conversation

@zach-klippenstein
Copy link
Copy Markdown
Collaborator

No description provided.

@zach-klippenstein zach-klippenstein force-pushed the zachklipp/upgrade-compose branch from 2fc0ce2 to d424c74 Compare January 7, 2021 19:21
@zach-klippenstein zach-klippenstein changed the title WIP Upgrade Compose to 1.0.0-alpha09. Upgrade Compose to 1.0.0-alpha09. Jan 7, 2021
@zach-klippenstein zach-klippenstein marked this pull request as ready for review January 7, 2021 19:22
* `~/.gradle/gradle.properties` file.
*/
val KotlinCompiler = System.getProperty("square.kotlinVersion") ?: "1.4.10"
val KotlinCompiler = System.getProperty("square.kotlinVersion") ?: "1.4.21"
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest compose version requires this kotlin version.


@Test fun when_includingPii_then_hierarchyContainsText() {
composeRule.setContentWithExplicitRoot {
Text("FooBar")
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Text is now material-specific.

Comment on lines -501 to +505
LazyColumnFor(items = listOf(1, 2, 3), modifier = Modifier.testTag("list")) {
Box(Modifier.testTag("child:$it"))
if (it % 2 == 0) {
Box(Modifier.testTag("child:$it (even)"))
LazyColumn(Modifier.testTag("list")) {
items(listOf(1, 2, 3)) {
Box(Modifier.testTag("child:$it"))
if (it % 2 == 0) {
Box(Modifier.testTag("child:$it (even)"))
}
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our code style changed, probably want to do an indentation pass over the whole codebase.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment on lines -576 to +577
SubcomposeLayout<Unit>(modifier) { constraints ->
SubcomposeLayout(modifier) { constraints ->
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't being suddenly inferred, the type parameter was actually removed.

Comment thread radiography/src/main/java/radiography/internal/ComposeLayoutInfo.kt
kotlinCompilerExtensionVersion = Versions.Compose
}

packagingOptions {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment about why this is needed?

Copy link
Copy Markdown
Collaborator Author

@zach-klippenstein zach-klippenstein Jan 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the same reason it's always needed for most kotlin libraries, I can link to more info but it's pretty standard. It's also already used in other modules in this library.

Comment thread radiography/src/main/java/radiography/internal/ComposeLayoutInfo.kt
@zach-klippenstein zach-klippenstein force-pushed the zachklipp/upgrade-compose branch 2 times, most recently from 6e8bffc to a3457f4 Compare January 8, 2021 02:27
@zach-klippenstein
Copy link
Copy Markdown
Collaborator Author

zach-klippenstein commented Jan 8, 2021

The build is failing because the GitHub workflow overrides the kotlin version to an old one: https://github.com/square/radiography/blob/2e0dff64cf4b9a4ea3bd559f9f800ba18628902b/.github/workflows/android.yml#L15

@pyricau do you remember why that's there? I think we should remove it.

Update: I think it's vestigial from when we were trying to build both 1.4 and 1.3 in CI. I'll remove it.

@zach-klippenstein zach-klippenstein force-pushed the zachklipp/upgrade-compose branch 2 times, most recently from b418ea2 to ef8ea37 Compare January 8, 2021 16:37
@zach-klippenstein zach-klippenstein force-pushed the zachklipp/upgrade-compose branch from ef8ea37 to 1e415fc Compare January 8, 2021 17:08
@zach-klippenstein zach-klippenstein merged commit 640dbb4 into main Jan 8, 2021
@zach-klippenstein zach-klippenstein deleted the zachklipp/upgrade-compose branch January 8, 2021 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants