Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions buildSrc/src/main/kotlin/coil3/hierarchyTemplate.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ private val hierarchyTemplate = KotlinHierarchyTemplate {
groupNonJvmCommon()
groupNative()
groupNonNative()
groupNonApple()
}
}

Expand Down Expand Up @@ -67,20 +68,38 @@ private fun KotlinHierarchyBuilder.groupNative() {
group("native") {
withNative()

group("apple") {
withApple()
groupApple()
groupLinux()
}
}

private fun KotlinHierarchyBuilder.groupApple() {
group("apple") {
withApple()

group("ios") {
withIos()
}
group("ios") {
withIos()
}

group("macos") {
withMacos()
}
group("macos") {
withMacos()
}
}
}

private fun KotlinHierarchyBuilder.groupLinux() {
group("linux") {
withLinux()
}
}

private fun KotlinHierarchyBuilder.groupNonApple() {
group("nonApple") {
groupNonNative()
groupLinux()
}
}

private fun KotlinHierarchyBuilder.groupNonNative() {
group("nonNative") {
groupJsCommon()
Expand Down
11 changes: 10 additions & 1 deletion buildSrc/src/main/kotlin/coil3/multiplatform.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ import org.gradle.kotlin.dsl.invoke
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension

fun Project.addAllMultiplatformTargets(skikoVersion: Provider<String>, enableWasm: Boolean = true) {
fun Project.addAllMultiplatformTargets(
skikoVersion: Provider<String>,
enableWasm: Boolean = true,
enableNativeLinux: Boolean = true,
) {
plugins.withId("org.jetbrains.kotlin.multiplatform") {
extensions.configure<KotlinMultiplatformExtension> {
applyCoilHierarchyTemplate()
Expand Down Expand Up @@ -63,6 +67,11 @@ fun Project.addAllMultiplatformTargets(skikoVersion: Provider<String>, enableWas

macosX64()
macosArm64()

if (enableNativeLinux) {
linuxX64()
linuxArm64()
}
}

applyKotlinJsImplicitDependencyWorkaround(enableWasm)
Expand Down
2 changes: 1 addition & 1 deletion coil-compose-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {
id("androidx.baselineprofile")
}

addAllMultiplatformTargets(libs.versions.skiko)
addAllMultiplatformTargets(libs.versions.skiko, enableNativeLinux = false)
androidLibrary(name = "coil3.compose.core") {
dependencies {
// https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-test.html
Expand Down
2 changes: 1 addition & 1 deletion coil-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
id("org.jetbrains.kotlin.plugin.compose")
}

addAllMultiplatformTargets(libs.versions.skiko)
addAllMultiplatformTargets(libs.versions.skiko, enableNativeLinux = false)
androidLibrary(name = "coil3.compose.singleton")

kotlin {
Expand Down
6 changes: 3 additions & 3 deletions coil-core/api/coil-core.klib.api
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Klib ABI Dump
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs]
// Alias: apple => [iosArm64, iosSimulatorArm64, iosX64, macosArm64, macosX64]
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
// Alias: native => [iosArm64, iosSimulatorArm64, iosX64, linuxArm64, linuxX64, macosArm64, macosX64]
// Rendering settings:
// - Signature version: 2
// - Show manifest properties: true
Expand Down Expand Up @@ -1069,5 +1069,5 @@ final inline fun (coil3.util/IntPair).coil3.util/component2(): kotlin/Int // coi
final inline fun (coil3.util/Logger).coil3.util/log(kotlin/String, coil3.util/Logger.Level, kotlin/Function0<kotlin/String>) // coil3.util/log|log@coil3.util.Logger(kotlin.String;coil3.util.Logger.Level;kotlin.Function0<kotlin.String>){}[0]
final inline fun (coil3.util/Logger).coil3.util/log(kotlin/String, kotlin/Throwable, kotlin/Function0<kotlin/String>) // coil3.util/log|log@coil3.util.Logger(kotlin.String;kotlin.Throwable;kotlin.Function0<kotlin.String>){}[0]

// Targets: [apple]
// Targets: [native]
final fun (coil3/ImageLoader).coil3/executeBlocking(coil3.request/ImageRequest): coil3.request/ImageResult // coil3/executeBlocking|executeBlocking@coil3.ImageLoader(coil3.request.ImageRequest){}[0]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Klib ABI Dump
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs]
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
// Rendering settings:
// - Signature version: 2
// - Show manifest properties: true
Expand Down
2 changes: 1 addition & 1 deletion coil-network-core/api/coil-network-core.klib.api
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Klib ABI Dump
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs]
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
// Rendering settings:
// - Signature version: 2
// - Show manifest properties: true
Expand Down
2 changes: 1 addition & 1 deletion coil-network-ktor2/api/coil-network-ktor2.klib.api
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Klib ABI Dump
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64]
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64]
// Rendering settings:
// - Signature version: 2
// - Show manifest properties: true
Expand Down
2 changes: 1 addition & 1 deletion coil-network-ktor3/api/coil-network-ktor3.klib.api
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Klib ABI Dump
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs]
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
// Rendering settings:
// - Signature version: 2
// - Show manifest properties: true
Expand Down
2 changes: 1 addition & 1 deletion coil-svg/api/coil-svg.klib.api
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Klib ABI Dump
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs]
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
// Rendering settings:
// - Signature version: 2
// - Show manifest properties: true
Expand Down
2 changes: 1 addition & 1 deletion coil-test/api/coil-test.klib.api
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Klib ABI Dump
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs]
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
// Rendering settings:
// - Signature version: 2
// - Show manifest properties: true
Expand Down
2 changes: 1 addition & 1 deletion coil/api/coil.klib.api
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Klib ABI Dump
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs]
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
// Rendering settings:
// - Signature version: 2
// - Show manifest properties: true
Expand Down
2 changes: 1 addition & 1 deletion internal/test-compose-ui-multiplatform/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {
id("org.jetbrains.kotlin.plugin.compose")
}

addAllMultiplatformTargets(libs.versions.skiko)
addAllMultiplatformTargets(libs.versions.skiko, enableNativeLinux = false)
androidLibrary(name = "coil3.test.composeuimultiplatform")

kotlin {
Expand Down
2 changes: 1 addition & 1 deletion internal/test-roborazzi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
id("io.github.takahirom.roborazzi")
}

addAllMultiplatformTargets(libs.versions.skiko)
addAllMultiplatformTargets(libs.versions.skiko, enableNativeLinux = false)
androidLibrary(name = "coil3.test.roborazzi")

kotlin {
Expand Down