Unverified Commit 0d4b50d0 authored by Sebastian Sellmair's avatar Sebastian Sellmair Committed by GitHub

[build] Properly mark jvm/awt source sets as optional, respecting the… (#1124)

… 'skiko.awt.enabled' feature flag
parent 0f1ee61f
...@@ -176,7 +176,7 @@ kotlin { ...@@ -176,7 +176,7 @@ kotlin {
implementation(kotlin("test-annotations-common")) implementation(kotlin("test-annotations-common"))
} }
skikoProjectContext.jvmMainSourceSet.dependencies { skikoProjectContext.jvmMainSourceSet?.dependencies {
implementation(kotlin("stdlib")) implementation(kotlin("stdlib"))
implementation(libs.coroutines.core.jvm) implementation(libs.coroutines.core.jvm)
} }
...@@ -189,7 +189,7 @@ kotlin { ...@@ -189,7 +189,7 @@ kotlin {
implementation(libs.coroutines.android) implementation(libs.coroutines.android)
} }
skikoProjectContext.jvmTestSourceSet.dependencies { skikoProjectContext.jvmTestSourceSet?.dependencies {
implementation(libs.coroutines.test) implementation(libs.coroutines.test)
implementation(kotlin("test-junit")) implementation(kotlin("test-junit"))
implementation(kotlin("test")) implementation(kotlin("test"))
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.plugin.KotlinHierarchyTemplate import org.jetbrains.kotlin.gradle.plugin.KotlinHierarchyTemplate
val SkikoProjectContext.jvmMainSourceSet get() = kotlin.sourceSets.getByName("jvmMain") val SkikoProjectContext.jvmMainSourceSet get() = if (project.supportAwt) kotlin.sourceSets.getByName("jvmMain") else null
val SkikoProjectContext.jvmTestSourceSet get() = kotlin.sourceSets.getByName("jvmTest") val SkikoProjectContext.jvmTestSourceSet get() = if (project.supportAwt) kotlin.sourceSets.getByName("jvmTest") else null
val SkikoProjectContext.awtMainSourceSet get() = if (project.supportAwt) kotlin.sourceSets.getByName("awtMain") else null val SkikoProjectContext.awtMainSourceSet get() = if (project.supportAwt) kotlin.sourceSets.getByName("awtMain") else null
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment