Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Kotlin to 1.6 and Compose to 1.1 #2372

Merged
merged 3 commits into from
Mar 15, 2022

Conversation

jpelgrom
Copy link
Member

@jpelgrom jpelgrom commented Mar 14, 2022

Summary

Update Kotlin to 1.6.10 and Compose to 1.1.1. Changes, aside from the version numbers:

  • Remove @ExperimantalComposeUiApi and @ExperimentalWearMaterialApi annotations from the Home Assistant codebase, because the functions where they are used aren't experimental, we are just using an experimental API in those functions. After updating to 1.6 we now have to opt in to functions that use these annotations at a higher level for the build to succeed. The @OptIn(ExperimantalXApi::class) annotations are placed at the 'lowest level' usage (so where we directly use a function from Compose that has the experimental API annotation).
  • Websocket: ProducerScope is no longer experimental so the annotation can be completely removed.
  • Wear: the animation APIs that are used for the time text are no longer experimental so the annotation can be completely removed.

Compose 1.1 also includes a breaking change for touch target sizing; I've checked all Compose based screens and nothing appears to be broken as a result of these changes.

Closes #2010

Screenshots

n/a

Link to pull request in Documentation repository

Not needed

Any other notes

 - Remove @ExperimantalComposeUiApi, @ExperimentalWearMaterialApi annotations (because the functions aren't experimental, we are just using an experimental API) and replace with an opt-in declaration at the 'lowest level' usage
 - Websocket: ProducerScope is no longer experimental so the annotation can be completely removed
 - Wear: the animation APIs that are used for the time text are no longer experimental so the annotation can be completely removed
Copy link
Collaborator

@JBassett JBassett left a comment

Choose a reason for hiding this comment

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

I just checked and because of #2359 you'll need to rebase your changes and make a couple of changes to get the build working because if I merge this we'll fail the build. Other than that it looks good.

@jpelgrom jpelgrom marked this pull request as draft March 15, 2022 13:44
@jpelgrom jpelgrom marked this pull request as ready for review March 15, 2022 13:48
@jpelgrom
Copy link
Member Author

Not sure what I did wrong but after rebasing there were a lot of additional changes, so I've just done a regular merge which seems to work as well

@JBassett JBassett merged commit b26928b into home-assistant:master Mar 15, 2022
@jpelgrom jpelgrom deleted the compose-1.1 branch March 15, 2022 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants