Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion bin/gradle
7 changes: 7 additions & 0 deletions client-sqldelight-gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import com.vanniktech.maven.publish.GradlePlugin
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.MavenPublishBaseExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile

plugins {
id("java-gradle-plugin")
Expand Down Expand Up @@ -48,6 +49,12 @@ tasks.withType<JavaCompile> {
targetCompatibility = JavaVersion.VERSION_17.toString()
}

tasks.withType(KotlinJvmCompile::class.java).configureEach {
kotlinOptions {
jvmTarget = "17"
}
}

gradlePlugin {
plugins {
create("backfila-client-sqldelight") {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package app.cash.backfila.client.sqldelight.plugin

import app.cash.sqldelight.gradle.GenerateMigrationOutputTask
import app.cash.sqldelight.gradle.SqlDelightExtension
import app.cash.sqldelight.gradle.SqlDelightTask
import java.io.Serializable
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Plugin
Expand Down Expand Up @@ -48,6 +50,16 @@ class BackfilaSqlDelightGradlePlugin : Plugin<Project> {
)
}

// This is to unblock usage. We need these dependencies so that gradle understands that sqldelight
// components need these. But that with take SQLDelight changes to its plugin.
// TODO: Remove these and replace with proper source sets to the correct SQLDelight tasks.
target.tasks.withType(SqlDelightTask::class.java) { t ->
t.dependsOn(sqlTask)
}
target.tasks.withType(GenerateMigrationOutputTask::class.java) { t ->
t.dependsOn(sqlTask)
}

val kotlinTask = target.tasks.register(
"generateBackfilaRecordSourceQueries${backfill.name.replaceFirstChar { it.uppercase() }}",
GenerateBackfilaRecordSourceQueriesTask::class.java,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -332,13 +332,15 @@ class BackfillShowAction @Inject constructor(
description = "",
),
) +
parameters.map { (key, value) ->
DescriptionListRow(
label = key.removePrefix(CUSTOM_PARAMETER_PREFIX.fieldId),
description = value,
)
}
} else listOf()
parameters.map { (key, value) ->
DescriptionListRow(
label = key.removePrefix(CUSTOM_PARAMETER_PREFIX.fieldId),
description = value,
)
}
} else {
listOf()
}

private fun TagConsumer<*>.Card(block: TagConsumer<*>.() -> Unit) {
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") {
Expand Down
Loading