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

kotlin 1.8.10 and friends #1017

Merged
merged 2 commits into from
Jun 13, 2023
Merged

kotlin 1.8.10 and friends #1017

merged 2 commits into from
Jun 13, 2023

Conversation

RBusarow
Copy link
Collaborator

  • kotlin 1.8.10
  • ksp 1.8.10-1.0.9
  • drop Kotlinter because it doesn't play nicely with KSP's new source sets
  • replace Kotlinter with com.rickbusarow.ktlint
  • KtLint 0.49.1
    • this comes with updated .editorconfig requirements

@RBusarow RBusarow force-pushed the rick/kotlin_1.8.10 branch 2 times, most recently from e79a755 to cf744e6 Compare June 12, 2023 16:19
- kotlin `1.8.10`
- ksp `1.8.10-1.0.9`
- drop Kotlinter because it doesn't play nicely with KSP's new source sets
- replace Kotlinter with `com.rickbusarow.ktlint`
- KtLint `0.49.1`
  - this comes with updated `.editorconfig` requirements
@RBusarow RBusarow force-pushed the rick/kotlin_1.8.10 branch from cf744e6 to 5fd4e07 Compare June 12, 2023 18:09
@RBusarow RBusarow marked this pull request as ready for review June 12, 2023 18:12
@RBusarow RBusarow requested review from a team and zach-klippenstein as code owners June 12, 2023 18:12
Copy link
Contributor

@steve-the-edwards steve-the-edwards left a comment

Choose a reason for hiding this comment

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

🍾

@@ -17,7 +17,7 @@ object HelloBackButtonWorkflow : StatefulWorkflow<Unit, State, Nothing, HelloBac
enum class State : Parcelable {
Able,
Baker,
Charlie;
Charlie
Copy link
Contributor

Choose a reason for hiding this comment

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

whoa - no more ; at the end. Can we have trailing commas :)?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is the standard:no-semi rule. I can enable it if you'd like me to. ;)

For commas... no, it's not possible. It just doesn't work. Lots of performance regressions and all of the internal canary branches crashed.

@@ -40,7 +40,7 @@ internal class BackStackContainerLifecycleActivity : AbstractLifecycleTestActivi
context: Context,
container: ViewGroup?
): ScreenViewHolder<BaseRendering> =
ScreenViewHolder(initialEnvironment, View(context)) { _, _ -> /* Noop */ }
ScreenViewHolder(initialEnvironment, View(context)) { _, _ -> }
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't get these? Did ktlint remove these now?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

pinterest/ktlint#1980

For the KtLint 0.49.x season, the comment-wrapping rule doesn't allow for single-line block comments. This is extracted into its own rule for 0.50.0.

@RBusarow RBusarow enabled auto-merge June 13, 2023 22:20
@RBusarow RBusarow merged commit 3b77ae8 into main Jun 13, 2023
@RBusarow RBusarow deleted the rick/kotlin_1.8.10 branch June 13, 2023 23:14
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