refactor(build): remove docker-compose hardcoded file, update compose dependencies, and resolve library conflicts
Deleted the unused `compose.hardcoded.yaml` file. Updated Gradle build scripts to resolve issues with Jackson and Resilience4j library bundles by explicitly specifying direct dependencies. Removed the `sqldelight` plugin and related dependencies from `local-db` module. Consolidated `docker-compose.yaml` to standardize restart policies. Adjusted `.env` to include cautions for sensitive data and rechecked Java version comments.
This commit is contained in:
@@ -29,11 +29,11 @@ kotlin {
|
||||
implementation(projects.frontend.shared)
|
||||
|
||||
// Compose dependencies
|
||||
implementation(compose.runtime)
|
||||
implementation(compose.foundation)
|
||||
implementation(compose.material3)
|
||||
implementation(compose.ui)
|
||||
implementation(compose.components.resources)
|
||||
implementation("org.jetbrains.compose.runtime:runtime:1.10.0-rc02")
|
||||
implementation("org.jetbrains.compose.foundation:foundation:1.10.0-rc02")
|
||||
implementation("org.jetbrains.compose.material3:material3:1.9.0-beta03")
|
||||
implementation("org.jetbrains.compose.ui:ui:1.10.0-rc02")
|
||||
implementation("org.jetbrains.compose.components:components-resources:1.10.0-rc02")
|
||||
|
||||
// Coroutines
|
||||
implementation(libs.kotlinx.coroutines.core)
|
||||
|
||||
@@ -5,7 +5,6 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
|
||||
plugins {
|
||||
alias(libs.plugins.kotlinMultiplatform)
|
||||
alias(libs.plugins.kotlinSerialization)
|
||||
alias(libs.plugins.sqldelight)
|
||||
}
|
||||
|
||||
kotlin {
|
||||
@@ -21,18 +20,13 @@ kotlin {
|
||||
sourceSets {
|
||||
commonMain.dependencies {
|
||||
implementation(libs.koin.core)
|
||||
implementation(libs.sqldelight.coroutines)
|
||||
implementation(libs.kotlinx.coroutines.core)
|
||||
}
|
||||
|
||||
jvmMain.dependencies {
|
||||
implementation(libs.sqldelight.driver.sqlite)
|
||||
}
|
||||
|
||||
jsMain.dependencies {
|
||||
implementation(libs.sqldelight.driver.webworker)
|
||||
implementation(npm("@cashapp/sqldelight-sqljs-worker", libs.versions.sqldelight.get()))
|
||||
implementation(npm("sql.js", "^1.8.0"))
|
||||
}
|
||||
|
||||
commonTest.dependencies {
|
||||
@@ -40,12 +34,3 @@ kotlin {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sqldelight {
|
||||
databases {
|
||||
register("MeldestelleDb") {
|
||||
packageName.set("at.mocode.frontend.core.localdb")
|
||||
// Sources are placed under src/commonMain/sqldelight by convention
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ kotlin {
|
||||
// ktor-client-resources optional; disabled until version is added to catalog
|
||||
|
||||
// Kotlinx core bundles
|
||||
implementation(libs.bundles.kotlinx.core)
|
||||
implementation(libs.kotlinx.coroutines.core)
|
||||
|
||||
// DI (Koin)
|
||||
api(libs.koin.core)
|
||||
|
||||
Reference in New Issue
Block a user