File tree Expand file tree Collapse file tree 2 files changed +21
-7
lines changed
client-sqldelight-gradle-plugin/src/main/kotlin/app/cash/backfila/client/sqldelight/plugin
service/src/main/kotlin/app/cash/backfila/ui/pages Expand file tree Collapse file tree 2 files changed +21
-7
lines changed Original file line number Diff line number Diff line change 1
1
package app.cash.backfila.client.sqldelight.plugin
2
2
3
+ import app.cash.sqldelight.gradle.GenerateMigrationOutputTask
3
4
import app.cash.sqldelight.gradle.SqlDelightExtension
5
+ import app.cash.sqldelight.gradle.SqlDelightTask
4
6
import java.io.Serializable
5
7
import org.gradle.api.NamedDomainObjectContainer
6
8
import org.gradle.api.Plugin
@@ -48,6 +50,16 @@ class BackfilaSqlDelightGradlePlugin : Plugin<Project> {
48
50
)
49
51
}
50
52
53
+ // This is to unblock usage. We need these dependencies so that gradle understands that sqldelight
54
+ // components need these. But that with take SQLDelight changes to its plugin.
55
+ // TODO: Remove these and replace with proper source sets to the correct SQLDelight tasks.
56
+ target.tasks.withType(SqlDelightTask ::class .java) { t ->
57
+ t.dependsOn(sqlTask)
58
+ }
59
+ target.tasks.withType(GenerateMigrationOutputTask ::class .java) { t ->
60
+ t.dependsOn(sqlTask)
61
+ }
62
+
51
63
val kotlinTask = target.tasks.register(
52
64
" generateBackfilaRecordSourceQueries${backfill.name.replaceFirstChar { it.uppercase() }} " ,
53
65
GenerateBackfilaRecordSourceQueriesTask ::class .java,
Original file line number Diff line number Diff line change @@ -332,13 +332,15 @@ class BackfillShowAction @Inject constructor(
332
332
description = " " ,
333
333
),
334
334
) +
335
- parameters.map { (key, value) ->
336
- DescriptionListRow (
337
- label = key.removePrefix(CUSTOM_PARAMETER_PREFIX .fieldId),
338
- description = value,
339
- )
340
- }
341
- } else listOf ()
335
+ parameters.map { (key, value) ->
336
+ DescriptionListRow (
337
+ label = key.removePrefix(CUSTOM_PARAMETER_PREFIX .fieldId),
338
+ description = value,
339
+ )
340
+ }
341
+ } else {
342
+ listOf ()
343
+ }
342
344
343
345
private fun TagConsumer <* >.Card (block : TagConsumer <* >.() -> Unit ) {
344
346
div(" -mx-4 mb-8 px-4 py-8 overflow-x-auto shadow-sm ring-1 ring-gray-900/5 sm:mx-0 sm:rounded-lg sm:px-8 lg:col-span-2 lg:row-span-2 lg:row-end-2" ) {
You can’t perform that action at this time.
0 commit comments