mirror of
https://github.com/msfjarvis/compose-lobsters
synced 2025-08-14 10:37:05 +05:30
build: cleanup sourceSet handling to drop unused vals
This commit is contained in:
parent
fde4e01697
commit
76c46b4229
3 changed files with 27 additions and 61 deletions
|
@ -8,39 +8,23 @@ plugins {
|
|||
}
|
||||
|
||||
kotlin {
|
||||
android() { compilations.all { kotlinOptions.jvmTarget = "11" } }
|
||||
android { compilations.all { kotlinOptions.jvmTarget = "11" } }
|
||||
jvm("desktop") { compilations.all { kotlinOptions.jvmTarget = "11" } }
|
||||
sourceSets {
|
||||
// Workaround for:
|
||||
//
|
||||
// The Kotlin source set androidAndroidTestRelease was configured but not added to any
|
||||
// Kotlin compilation. You can add a source set to a target's compilation by connecting it
|
||||
// with the compilation's default source set using 'dependsOn'.
|
||||
// See
|
||||
// https://kotlinlang.org/docs/reference/building-mpp-with-gradle.html#connecting-source-sets
|
||||
//
|
||||
// This workaround includes `dependsOn(androidAndroidTestRelease)` in the `androidTest`
|
||||
// sourceSet.
|
||||
val androidAndroidTestRelease by getting
|
||||
val commonMain by getting {
|
||||
dependencies {
|
||||
api(compose.runtime)
|
||||
api(compose.foundation)
|
||||
api(compose.material)
|
||||
api(projects.database)
|
||||
}
|
||||
sourceSets["commonMain"].apply {
|
||||
dependencies {
|
||||
api(compose.runtime)
|
||||
api(compose.foundation)
|
||||
api(compose.material)
|
||||
api(projects.database)
|
||||
}
|
||||
val commonTest by getting
|
||||
val androidMain by getting {
|
||||
dependencies {
|
||||
implementation(libs.androidx.browser)
|
||||
implementation(libs.coil.compose)
|
||||
}
|
||||
}
|
||||
sourceSets["androidMain"].apply {
|
||||
dependencies {
|
||||
implementation(libs.androidx.browser)
|
||||
implementation(libs.coil.compose)
|
||||
}
|
||||
val androidTest by getting { dependsOn(androidAndroidTestRelease) }
|
||||
val desktopMain by getting { dependencies { implementation(libs.kamel.image) } }
|
||||
val desktopTest by getting
|
||||
}
|
||||
sourceSets["desktopMain"].apply { dependencies { implementation(libs.kamel.image) } }
|
||||
}
|
||||
|
||||
tasks.withType<KotlinCompile> {
|
||||
|
|
|
@ -13,28 +13,12 @@ kotlin {
|
|||
kotlinOptions.freeCompilerArgs + listOf("-Xopt-in=kotlin.RequiresOptIn")
|
||||
}
|
||||
}
|
||||
sourceSets {
|
||||
// Workaround for:
|
||||
//
|
||||
// The Kotlin source set androidAndroidTestRelease was configured but not added to any
|
||||
// Kotlin compilation. You can add a source set to a target's compilation by connecting it
|
||||
// with the compilation's default source set using 'dependsOn'.
|
||||
// See
|
||||
// https://kotlinlang.org/docs/reference/building-mpp-with-gradle.html#connecting-source-sets
|
||||
//
|
||||
// This workaround includes `dependsOn(androidAndroidTestRelease)` in the `androidTest`
|
||||
// sourceSet.
|
||||
val androidAndroidTestRelease by getting
|
||||
val commonMain by getting
|
||||
val commonTest by getting
|
||||
val androidMain by getting { dependencies { implementation(libs.sqldelight.androidDriver) } }
|
||||
val androidTest by getting { dependsOn(androidAndroidTestRelease) }
|
||||
val desktopMain by getting { dependencies { implementation(libs.sqldelight.jvmDriver) } }
|
||||
val desktopTest by getting {
|
||||
dependencies {
|
||||
implementation(libs.kotlin.coroutines.core)
|
||||
implementation(kotlin("test-junit"))
|
||||
}
|
||||
sourceSets["androidMain"].apply { dependencies { implementation(libs.sqldelight.androidDriver) } }
|
||||
sourceSets["desktopMain"].apply { dependencies { implementation(libs.sqldelight.jvmDriver) } }
|
||||
sourceSets["desktopTest"].apply {
|
||||
dependencies {
|
||||
implementation(libs.kotlin.coroutines.core)
|
||||
implementation(kotlin("test-junit"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,17 +12,15 @@ version = "1.0"
|
|||
|
||||
kotlin {
|
||||
jvm { compilations.all { kotlinOptions.jvmTarget = "11" } }
|
||||
sourceSets {
|
||||
val jvmMain by getting {
|
||||
dependencies {
|
||||
implementation(projects.common)
|
||||
implementation(libs.aurora.component)
|
||||
implementation(libs.aurora.skin)
|
||||
implementation(libs.aurora.window)
|
||||
implementation(compose.desktop.currentOs)
|
||||
}
|
||||
sourceSets["jvmMain"].apply {
|
||||
dependencies {
|
||||
implementation(projects.api)
|
||||
implementation(projects.common)
|
||||
implementation(libs.aurora.component)
|
||||
implementation(libs.aurora.skin)
|
||||
implementation(libs.aurora.window)
|
||||
implementation(compose.desktop.currentOs)
|
||||
}
|
||||
val jvmTest by getting
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue