From 3f98e2974cef895caee8286a7a8d64003c490db0 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Fri, 20 Nov 2020 12:46:09 +0100
Subject: [PATCH] Expand AndroidSourceSet#kotlinSourceSet to
 AndroidSourceSet#kotlinSourceSetOrNull

---
 .../gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt
index c1c7ae33777..1956643eefa 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt
@@ -35,11 +35,14 @@ internal fun syncKotlinAndAndroidSourceSets(target: KotlinAndroidTarget) {
 }
 
 internal var AndroidSourceSet.kotlinSourceSet: KotlinSourceSet
-    get() = getConvention(KOTLIN_DSL_NAME) as KotlinSourceSet
+    get() = checkNotNull(kotlinSourceSetOrNull) { "Missing kotlinSourceSet for Android source set $name" }
     private set(value) {
         addConvention(KOTLIN_DSL_NAME, value)
     }
 
+internal val AndroidSourceSet.kotlinSourceSetOrNull: KotlinSourceSet?
+    get() = getConvention(KOTLIN_DSL_NAME) as? KotlinSourceSet
+
 private fun createDefaultDependsOnEdges(
     target: KotlinAndroidTarget,
     kotlinSourceSet: KotlinSourceSet,