Cleanup workarounds for KSP that aren't needed anymore (#192)

eygraber · Jul 7, 2023 · 616e562 · 616e562
1 parent 2b67596
commit 616e562
Showing 1 changed file with 0 additions and 37 deletions.
diff --git a/conventions-plugin/src/main/kotlin/ksp.kt b/conventions-plugin/src/main/kotlin/ksp.kt
@@ -2,34 +2,14 @@ import com.eygraber.conventions.capitalize
 import io.gitlab.arturbosch.detekt.Detekt
 import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
 import org.jetbrains.kotlin.gradle.kpm.external.project
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 interface KspDependencies {
   fun ksp(dependencyNotation: Any)
 }
 
-fun KotlinProjectExtension.configureKspSourceSets() {
-  check(this !is KotlinMultiplatformExtension) {
-    """
-    |configureKspSourceSets isn't meant to be used with KMP.
-    |Please use one of the functions meant for use with KMP:
-    |  KotlinTarget.kspDependencies
-    |  KotlinMultiplatformExtension.kspDependenciesForAllTargets
-    |  KotlinMultiplatformExtension.commonMainKspDependencies
-    """.trimMargin()
-  }
-
-  sourceSets.configureEach {
-    kotlin.srcDir("build/generated/ksp/$name/kotlin")
-    kotlin.srcDir("build/generated/ksp/$name/java")
-    resources.srcDir("build/generated/ksp/$name/resources")
-  }
-}
-
 fun KotlinTarget.kspDependencies(block: KspDependencies.() -> Unit) {
   val configurationName = "ksp${targetName.capitalize()}"
   project.dependencies {
@@ -39,13 +19,6 @@ fun KotlinTarget.kspDependencies(block: KspDependencies.() -> Unit) {
       }
     }.block()
   }
-
-  compilations.configureEach {
-    kotlinSourceSets.forEach { sourceSet ->
-      sourceSet.kotlin.srcDir("build/generated/ksp/$targetName/${sourceSet.name}/kotlin")
-      sourceSet.resources.srcDir("build/generated/ksp/$targetName/${sourceSet.name}/resources")
-    }
-  }
 }
 
 fun KotlinMultiplatformExtension.kspDependenciesForAllTargets(block: KspDependencies.() -> Unit) {
@@ -66,16 +39,6 @@ fun KotlinMultiplatformExtension.commonMainKspDependencies(block: KspDependencie
     }.block()
   }
 
-  sourceSets.named("commonMain").configure {
-    kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
-  }
-
-  project.tasks.withType(KotlinCompilationTask::class.java).configureEach {
-    if(name != "kspCommonMainKotlinMetadata") {
-      dependsOn("kspCommonMainKotlinMetadata")
-    }
-  }
-
   project.plugins.withId("io.gitlab.arturbosch.detekt") {
     project.tasks.withType(Detekt::class.java).configureEach {
       if(name != "detekt") {