fix(folio): build green on Android assemble + iOS framework link

- Drop ksp/metro/navigation3 plugin aliases - not actually applied
  by any module in this PR (deferred follow-up).
- import awaitAsOne from app.cash.sqldelight.async.coroutines for
  the suspend single-row reads enabled by generateAsync = true.
- Drop kotlin.js.ExperimentalWasmJsInterop opt-in from common
  compilerOptions (it isn't valid for android/jvm targets).
- :app:shared androidMain pulls in androidx.activity:activity-compose
  for the BackHandler actual.
This commit is contained in:
pj committed 2026-04-26 14:36:51 +07:00
1 parent 7d3efdcc7a
commit 9293deb858
6 files changed
+4 -15

No files matched your search

+3 -1
View File
@@ -14,7 +14,6 @@ kotlin {
@OptIn(ExperimentalKotlinGradlePluginApi::class) @OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions { compilerOptions {
freeCompilerArgs.add("-Xexpect-actual-classes") freeCompilerArgs.add("-Xexpect-actual-classes")
optIn.add("kotlin.js.ExperimentalWasmJsInterop")
} }
androidTarget { androidTarget {
@@ -48,6 +47,9 @@ kotlin {
implementation(libs.kotlinx.serialization.json) implementation(libs.kotlinx.serialization.json)
implementation(libs.lifecycle.viewmodel.compose) implementation(libs.lifecycle.viewmodel.compose)
} }
androidMain.dependencies {
implementation(libs.androidx.activity.compose)
}
} }
} }
@@ -13,7 +13,6 @@ kotlin {
@OptIn(ExperimentalKotlinGradlePluginApi::class) @OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions { compilerOptions {
freeCompilerArgs.add("-Xexpect-actual-classes") freeCompilerArgs.add("-Xexpect-actual-classes")
optIn.add("kotlin.js.ExperimentalWasmJsInterop")
} }
androidTarget { androidTarget {
-2
View File
@@ -7,6 +7,4 @@ plugins {
alias(libs.plugins.kotlin.plugin.serialization) apply false alias(libs.plugins.kotlin.plugin.serialization) apply false
alias(libs.plugins.compose.multiplatform) apply false alias(libs.plugins.compose.multiplatform) apply false
alias(libs.plugins.sqldelight) apply false alias(libs.plugins.sqldelight) apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.metro) apply false
} }
-1
View File
@@ -12,7 +12,6 @@ kotlin {
@OptIn(ExperimentalKotlinGradlePluginApi::class) @OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions { compilerOptions {
freeCompilerArgs.add("-Xexpect-actual-classes") freeCompilerArgs.add("-Xexpect-actual-classes")
optIn.add("kotlin.js.ExperimentalWasmJsInterop")
} }
androidTarget { androidTarget {
@@ -1,5 +1,6 @@
package app.folio.core.data package app.folio.core.data
import app.cash.sqldelight.async.coroutines.awaitAsOne
import app.cash.sqldelight.coroutines.asFlow import app.cash.sqldelight.coroutines.asFlow
import app.cash.sqldelight.coroutines.mapToList import app.cash.sqldelight.coroutines.mapToList
import app.cash.sqldelight.coroutines.mapToOneOrNull import app.cash.sqldelight.coroutines.mapToOneOrNull
-10
View File
@@ -5,9 +5,6 @@ compose-multiplatform = "1.10.3"
sqldelight = "2.3.2" sqldelight = "2.3.2"
kotlinx-coroutines = "1.10.2" kotlinx-coroutines = "1.10.2"
kotlinx-serialization = "1.9.0" kotlinx-serialization = "1.9.0"
navigation3 = "1.1.1"
metro = "0.13.2"
ksp = "2.3.20-2.0.5"
lifecycle-viewmodel-compose = "2.10.0" lifecycle-viewmodel-compose = "2.10.0"
activity-compose = "1.13.0" activity-compose = "1.13.0"
@@ -22,11 +19,6 @@ sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", ver
sqldelight-native-driver = { module = "app.cash.sqldelight:native-driver", version.ref = "sqldelight" } sqldelight-native-driver = { module = "app.cash.sqldelight:native-driver", version.ref = "sqldelight" }
sqldelight-web-worker-driver = { module = "app.cash.sqldelight:web-worker-driver", version.ref = "sqldelight" } sqldelight-web-worker-driver = { module = "app.cash.sqldelight:web-worker-driver", version.ref = "sqldelight" }
navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "navigation3" }
navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "navigation3" }
metro-runtime = { module = "dev.zacsweers.metro:runtime", version.ref = "metro" }
lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle-viewmodel-compose" } lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle-viewmodel-compose" }
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
@@ -40,5 +32,3 @@ kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.re
kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" } compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" } sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
metro = { id = "dev.zacsweers.metro", version.ref = "metro" }