From 54e1397fbbfc7e82074fceaabaf9b64a01f06324 Mon Sep 17 00:00:00 2001 From: ketsuban Date: Thu, 27 Aug 2026 11:38:01 +0000 Subject: Fix baseline compile: AndroidX flag, PresentationExporter dup, dp import, Android driver schema --- apps/desktop/src/jvmMain/kotlin/jp/orgflow/app/desktop/Main.kt | 1 + gradle.properties | 2 +- .../kotlin/jp/orgflow/presentation/export/OrgFlowHtmlExporter.kt | 5 ----- .../jp/orgflow/storage/android/AndroidDatabaseDriverFactory.kt | 9 +++++++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/desktop/src/jvmMain/kotlin/jp/orgflow/app/desktop/Main.kt b/apps/desktop/src/jvmMain/kotlin/jp/orgflow/app/desktop/Main.kt index 26a9d35..196e446 100644 --- a/apps/desktop/src/jvmMain/kotlin/jp/orgflow/app/desktop/Main.kt +++ b/apps/desktop/src/jvmMain/kotlin/jp/orgflow/app/desktop/Main.kt @@ -6,6 +6,7 @@ import androidx.compose.material.Text import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Window import androidx.compose.ui.window.application diff --git a/gradle.properties b/gradle.properties index f257487..958e132 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ org.gradle.parallel=true org.gradle.caching=true org.gradle.configuration-cache=true kotlin.mpp.stability.nowarn=true -android.useAndroidX=false +android.useAndroidX=true diff --git a/modules/orgflow-presentation/src/commonMain/kotlin/jp/orgflow/presentation/export/OrgFlowHtmlExporter.kt b/modules/orgflow-presentation/src/commonMain/kotlin/jp/orgflow/presentation/export/OrgFlowHtmlExporter.kt index f1adf30..b95d69c 100644 --- a/modules/orgflow-presentation/src/commonMain/kotlin/jp/orgflow/presentation/export/OrgFlowHtmlExporter.kt +++ b/modules/orgflow-presentation/src/commonMain/kotlin/jp/orgflow/presentation/export/OrgFlowHtmlExporter.kt @@ -1,13 +1,8 @@ package jp.orgflow.presentation.export import jp.orgflow.presentation.model.Presentation -import jp.orgflow.presentation.model.PresentationSlide import jp.orgflow.presentation.model.SlidePlacement -class PresentationExporter { - fun exportHtml(presentation: Presentation): String = OrgFlowHtmlExporter.export(presentation) -} - object OrgFlowHtmlExporter { fun export(presentation: Presentation): String { val sb = StringBuilder() diff --git a/modules/orgflow-storage/src/androidMain/kotlin/jp/orgflow/storage/android/AndroidDatabaseDriverFactory.kt b/modules/orgflow-storage/src/androidMain/kotlin/jp/orgflow/storage/android/AndroidDatabaseDriverFactory.kt index a5da32c..4a545d1 100644 --- a/modules/orgflow-storage/src/androidMain/kotlin/jp/orgflow/storage/android/AndroidDatabaseDriverFactory.kt +++ b/modules/orgflow-storage/src/androidMain/kotlin/jp/orgflow/storage/android/AndroidDatabaseDriverFactory.kt @@ -1,10 +1,15 @@ package jp.orgflow.storage.android import android.content.Context +import app.cash.sqldelight.db.QueryResult import app.cash.sqldelight.db.SqlDriver +import app.cash.sqldelight.db.SqlSchema import app.cash.sqldelight.driver.android.AndroidSqliteDriver object AndroidDatabaseDriverFactory { - fun create(context: Context, name: String = "orgflow.db"): SqlDriver = - AndroidSqliteDriver(name, context, null) + fun create( + schema: SqlSchema>, + context: Context, + name: String = "orgflow.db", + ): SqlDriver = AndroidSqliteDriver(schema, context, name) } \ No newline at end of file -- cgit v1.2.1