Skip to content

Conversation

@vRallev
Copy link
Contributor

@vRallev vRallev commented Jan 5, 2022

No description provided.

const val foundation = "androidx.compose.foundation:foundation:1.1.0-rc01"
const val material = "androidx.compose.material:material:1.1.0-rc01"
const val tooling = "androidx.compose.ui:ui-tooling:1.1.0-rc01"
const val ui = "androidx.compose.ui:ui:1.1.0-rc01"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note that this is the latest version for these libraries, but there's an rc02 for the compiler plugin with Kotlin 1.6.10 support. We'll use the same versions internally very soon.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you file an issue tracking this, and add a comment here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

const val moshi = "com.squareup.moshi:moshi:1.12.0"
const val adapters = "com.squareup.moshi:moshi-adapters:1.13.0"
const val codeGen = "com.squareup.moshi:moshi-kotlin-codegen:1.13.0"
const val moshi = "com.squareup.moshi:moshi:1.13.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

To support Kotlin 1.6.10.

public static synthetic fun cancelRuntime$default (Lcom/squareup/workflow1/internal/WorkflowRunner;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
public final fun nextOutput (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun nextRendering ()Lcom/squareup/workflow1/RenderingAndSnapshot;
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The compiler starts spitting out so much more.

Base automatically changed from ralf/compile-sdk to main January 5, 2022 15:44
@rjrjr
Copy link
Collaborator

rjrjr commented Jan 5, 2022

Is this a draft on purpose? Wondering if I should review yet.

@vRallev
Copy link
Contributor Author

vRallev commented Jan 5, 2022

Is this a draft on purpose? Wondering if I should review yet.

I personally would wait until we use Kotlin 1.6 internally, otherwise upgrading Workflow internally is blocked. Hence I kept the PR in draft. You could review it now already, though.

* We define this otherwise redundant typealias to keep composite workflows
* that build on [RunGameWorkflow] decoupled from it, for ease of testing.
*/
@OptIn(WorkflowUiExperimentalApi::class)
Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't see why this is needed, possible b/c of the @WorkflowUiExperimentalApi mistake above? Same question for the other new appearances.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The compiler is more strict. It's needed even with the other change.

> Task :samples:tictactoe:common:compileKotlin FAILED
e: /Users/ralf/Development/projects/square/workflow-kotlin/samples/tictactoe/common/src/main/java/com/squareup/sample/gameworkflow/RunGameWorkflow.kt: (46, 59): This declaration is experimental and its usage must be marked with '@com.squareup.workflow1.ui.WorkflowUiExperimentalApi' or '@OptIn(com.squareup.workflow1.ui.WorkflowUiExperimentalApi::class)'

@vRallev vRallev marked this pull request as ready for review January 19, 2022 03:16
@vRallev vRallev requested review from a team and zach-klippenstein as code owners January 19, 2022 03:16
Copy link

@vgonda vgonda left a comment

Choose a reason for hiding this comment

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

Seems fine to me

Copy link

@0xMatthewGroves 0xMatthewGroves left a comment

Choose a reason for hiding this comment

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

LGTM.

@rjrjr
Copy link
Collaborator

rjrjr commented Jan 19, 2022

Red shard is b/c request failures. Green API 21 shard is good enough for me, merging.

@rjrjr rjrjr merged commit b11e1d0 into main Jan 19, 2022
@rjrjr rjrjr deleted the ralf/kotlin_1_6 branch January 19, 2022 18:32
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.

5 participants