Skip to content

Commit

Permalink
Remove mobileMain source set
Browse files Browse the repository at this point in the history
  • Loading branch information
zsmb13 committed Oct 21, 2024
1 parent decb99a commit 1c72657
Show file tree
Hide file tree
Showing 85 changed files with 43 additions and 80 deletions.
121 changes: 42 additions & 79 deletions shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,99 +44,62 @@ kotlin {
}

sourceSets {
val commonMain by getting {
dependencies {
compileOnly(compose.runtime)

api(libs.components.ui.tooling.preview)
api(compose.components.resources)

api(libs.ktor.client.logging)
api(libs.ktor.serialization.kotlinx.json)
api(libs.ktor.client.content.negotiation)
api(libs.ktor.utils)

implementation(libs.kotlinx.datetime)
implementation(libs.material3)
}
}
commonMain.dependencies {
api(compose.runtime)
api(compose.foundation)
api(compose.animation)
api(compose.material)
api(compose.components.resources)

val commonTest by getting {
dependencies {
implementation(kotlin("test"))
}
}
api(libs.components.ui.tooling.preview)

val mobileMain by creating {
dependsOn(commonMain)
dependencies {
api(compose.runtime)
api(compose.foundation)
api(compose.animation)
api(compose.material)
api(compose.components.resources)
api(libs.ktor.client.logging)
api(libs.ktor.serialization.kotlinx.json)
api(libs.ktor.client.content.negotiation)
api(libs.ktor.utils)

implementation(libs.androidx.navigation.compose)
implementation(libs.multiplatform.markdown.renderer.m3)
implementation(libs.ktor.client.core)
implementation(libs.kotlinx.datetime)
implementation(libs.material3)

api(libs.image.loader)
}
}
implementation(libs.androidx.navigation.compose)
implementation(libs.multiplatform.markdown.renderer.m3)
implementation(libs.ktor.client.core)

val mobileTest by creating {
dependsOn(mobileMain)
dependsOn(commonTest)
api(libs.image.loader)
}

val androidMain by getting {
dependsOn(mobileMain)

dependencies {
implementation(compose.runtime)
implementation(compose.foundation)
implementation(compose.material)
implementation(compose.ui)
implementation(compose.components.resources)

implementation(libs.android.svg)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.work.runtime)
implementation(libs.androidx.preference)
implementation(libs.compose.ui.tooling.preview)

implementation(libs.ktor.client.cio)
}
commonTest.dependencies {
implementation(kotlin("test"))
}

val iosX64Main by getting
val iosArm64Main by getting
val iosSimulatorArm64Main by getting
androidMain.dependencies {
implementation(compose.runtime)
implementation(compose.foundation)
implementation(compose.material)
implementation(compose.ui)
implementation(compose.components.resources)

val iosMain by creating {
dependsOn(mobileMain)

dependencies {
implementation(libs.ktor.client.darwin)
}
implementation(libs.android.svg)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.work.runtime)
implementation(libs.androidx.preference)
implementation(libs.compose.ui.tooling.preview)

iosX64Main.dependsOn(this)
iosArm64Main.dependsOn(this)
iosSimulatorArm64Main.dependsOn(this)
implementation(libs.ktor.client.cio)
}

val jvmMain by getting {
dependsOn(mobileMain)
iosMain.dependencies {
implementation(libs.ktor.client.darwin)
}

dependencies {
implementation(libs.ktor.client.cio)
implementation(compose.desktop.currentOs)
implementation(libs.android.svg)
}
jvmMain.dependencies {
implementation(libs.ktor.client.cio)
implementation(compose.desktop.currentOs)
implementation(libs.android.svg)
}
val webMain by creating {
dependsOn(mobileMain)

val webMain by creating {
dependsOn(commonMain.get())
dependencies {
implementation(libs.ktor.client.js)
}
Expand All @@ -146,7 +109,7 @@ kotlin {
dependsOn(webMain)
}

val jsMain by getting {
jsMain {
dependsOn(webMain)
}
}
Expand Down Expand Up @@ -190,7 +153,7 @@ val buildWebApp by tasks.creating(Copy::class) {
val jsWebpack = "jsBrowserProductionWebpack"

dependsOn(wasmWebpack, jsWebpack)

// TODO could be removed after migration to Kotlin 2.0+
kotlin.wasmJs {
applyBinaryen()
Expand Down
2 changes: 1 addition & 1 deletion shared/shared.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ Pod::Spec.new do |spec|
SCRIPT
}
]
spec.resources = ['src/commonMain/resources/**', 'src/iosMain/resources/**', 'src/mobileMain/resources/**']
spec.resources = ['src/commonMain/resources/**', 'src/iosMain/resources/**']
end

0 comments on commit 1c72657

Please sign in to comment.