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
79 changes: 47 additions & 32 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.dsl.abi.AbiValidationExtension
import org.jetbrains.kotlin.gradle.dsl.abi.AbiValidationMultiplatformExtension
import org.jetbrains.kotlin.gradle.dsl.abi.AbiValidationVariantSpec
import org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation
import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
Expand All @@ -27,7 +26,6 @@ buildscript {
classpath(libs.gradlePlugin.atomicFu)
classpath(libs.gradlePlugin.jetbrainsCompose)
classpath(libs.gradlePlugin.composeCompiler)
classpath(libs.gradlePlugin.kotlin)
classpath(libs.gradlePlugin.mavenPublish)
classpath(libs.gradlePlugin.paparazzi)
classpath(libs.gradlePlugin.roborazzi)
Expand Down Expand Up @@ -104,12 +102,6 @@ allprojects {
}
}

tasks.configureEach {
if (name.startsWith("spotless")) {
notCompatibleWithConfigurationCache("https://github.com/diffplug/spotless/issues/2459")
}
}

plugins.withId("org.jetbrains.kotlin.plugin.compose") {
extensions.configure<ComposeCompilerGradlePluginExtension> {
stabilityConfigurationFiles.add {
Expand Down Expand Up @@ -140,30 +132,7 @@ allprojects {
}

if (project.name in publicModules) {
@OptIn(ExperimentalAbiValidation::class)
plugins.withType<KotlinBasePlugin> {
extensions.configure<KotlinProjectExtension> {
fun AbiValidationVariantSpec.configure() = filters {
excluded {
annotatedWith.add("coil3.annotation.InternalCoilApi")
}
}

// Unfortunately the 'enabled' property doesn't share a common interface.
val singleTargetExtension = extensions.findByType<AbiValidationExtension>()
if (singleTargetExtension != null) {
singleTargetExtension.apply {
enabled = true
configure()
}
} else {
extensions.configure<AbiValidationMultiplatformExtension> {
enabled = true
configure()
}
}
}
}
configureAbiValidation()
}

// Skiko's runtime files are ESM-only so preload our shim to let Node require them during tests.
Expand All @@ -176,6 +145,52 @@ allprojects {
}
}

fun configureAbiValidation() {
@OptIn(ExperimentalAbiValidation::class)
fun Project.configureKotlinProject() {
extensions.configure<KotlinProjectExtension> {
fun AbiValidationVariantSpec.configure() = filters {
excluded {
annotatedWith.add("coil3.annotation.InternalCoilApi")
}
}

// Unfortunately the 'enabled' property doesn't share a common interface.
extensions.findByType<AbiValidationExtension>()?.apply {
enabled = true
configure()
}
extensions.findByType<AbiValidationMultiplatformExtension>()?.apply {
enabled = true
configure()
}
}
}

pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
configureKotlinProject()
}
pluginManager.withPlugin("com.android.kotlin.multiplatform.library") {
pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
configureKotlinProject()
}
}
pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
configureKotlinProject()
}

// Built-in Kotlin Android wires the Kotlin extension during Android plugin application.
pluginManager.withPlugin("com.android.application") {
configureKotlinProject()
}
pluginManager.withPlugin("com.android.library") {
configureKotlinProject()
}
pluginManager.withPlugin("com.android.test") {
configureKotlinProject()
}
}

private val ktlintRules = buildMap {
put("ktlint_code_style", "intellij_idea")

Expand Down
3 changes: 2 additions & 1 deletion buildSrc/src/main/kotlin/coil3/multiplatform.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ fun Project.addAllMultiplatformTargets(
plugins.withId("org.jetbrains.kotlin.multiplatform") {
extensions.configure<KotlinMultiplatformExtension> {
applyCoilHierarchyTemplate()
val sharedKarmaConfigDirectory = rootProject.projectDir.resolve("karma.config.d")

jvm()

val sharedKarmaConfigDirectory = rootProject.projectDir.resolve("karma.config.d")

js {
browser {
testTask {
Expand Down
1 change: 0 additions & 1 deletion coil-gif/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import coil3.androidLibrary

plugins {
id("com.android.library")
id("kotlin-android")
}

androidLibrary(name = "coil3.gif")
Expand Down
1 change: 0 additions & 1 deletion coil-video/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import coil3.androidLibrary

plugins {
id("com.android.library")
id("kotlin-android")
}

androidLibrary(name = "coil3.video")
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ android.javaCompile.suppressSourceTargetDeprecationWarning=true
android.useAndroidX=true

# https://github.com/cashapp/paparazzi/issues/2095
android.builtInKotlin=false
android.newDsl=false

# Disable welcome message.
Expand Down
1 change: 0 additions & 1 deletion internal/benchmark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import com.android.build.api.dsl.ManagedVirtualDevice

plugins {
id("com.android.test")
id("kotlin-android")
id("androidx.baselineprofile.producer")
}

Expand Down
1 change: 0 additions & 1 deletion internal/test-compose-screenshot/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import coil3.androidLibrary

plugins {
id("com.android.library")
id("kotlin-android")
id("org.jetbrains.compose")
id("org.jetbrains.kotlin.plugin.compose")
alias(libs.plugins.screenshot)
Expand Down
1 change: 0 additions & 1 deletion internal/test-paparazzi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import coil3.androidLibrary

plugins {
id("com.android.library")
id("kotlin-android")
id("org.jetbrains.compose")
id("org.jetbrains.kotlin.plugin.compose")
id("app.cash.paparazzi")
Expand Down
1 change: 0 additions & 1 deletion samples/compose-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import coil3.androidApplication

plugins {
id("com.android.application")
id("kotlin-android")
id("org.jetbrains.compose")
id("org.jetbrains.kotlin.plugin.compose")
}
Expand Down
1 change: 0 additions & 1 deletion samples/view/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import coil3.androidApplication

plugins {
id("com.android.application")
id("kotlin-android")
}

androidApplication(name = "sample.view") {
Expand Down