Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid NPEs in Kotlin 1.7.20 #3398

Merged
merged 2 commits into from Jul 31, 2022
Merged

Avoid NPEs in Kotlin 1.7.20 #3398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43842f0
Avoid NPEs in Kotlin 1.7.20
ZacSweers Jul 30, 2022
e37e172
Add missing changes
ZacSweers Jul 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/SqlDelightDatabase.kt
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ class SqlDelightDatabase(
private val generatedSourcesDirectory
get() = File(project.buildDir, "generated/sqldelight/code/$name")

private val sources by lazy { sources() }
private val sources by lazy { sources(project) }
private val dependencies = mutableListOf<SqlDelightDatabase>()

private var recursionGuard = false
Expand Down
11 changes: 6 additions & 5 deletions sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/kotlin/SourceRoots.kt
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@ import com.android.build.gradle.BaseExtension
import com.android.build.gradle.LibraryExtension
import com.android.build.gradle.api.BaseVariant
import org.gradle.api.DomainObjectSet
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.file.SourceDirectorySet
import org.gradle.api.provider.Provider
Expand All @@ -32,7 +33,7 @@ import java.io.File
*
* Multiplatform environment with android target (oh boy)
*/
internal fun SqlDelightDatabase.sources(): List<Source> {
internal fun SqlDelightDatabase.sources(project: Project): List<Source> {
// Multiplatform project.
project.extensions.findByType(KotlinMultiplatformExtension::class.java)?.let {
return it.sources()
Expand All @@ -45,7 +46,7 @@ internal fun SqlDelightDatabase.sources(): List<Source> {

// Android project.
project.extensions.findByName("android")?.let {
return (it as BaseExtension).sources()
return (it as BaseExtension).sources(project)
}

// Kotlin project.
Expand All @@ -55,7 +56,7 @@ internal fun SqlDelightDatabase.sources(): List<Source> {
type = KotlinPlatformType.jvm,
name = "main",
sourceSets = listOf("main"),
sourceDirectorySet = sourceSets.getByName("main").kotlin!!,
sourceDirectorySet = sourceSets.getByName("main").kotlin ?: project.objects.sourceDirectorySet("empty", "Empty kotlin source set"),
),
)
}
Expand Down Expand Up @@ -87,7 +88,7 @@ private fun KotlinMultiplatformExtension.sources(): List<Source> {
)
}

private fun BaseExtension.sources(): List<Source> {
private fun BaseExtension.sources(project: Project): List<Source> {
val variants: DomainObjectSet<out BaseVariant> = when (this) {
is AppExtension -> applicationVariants
is LibraryExtension -> libraryVariants
Expand All @@ -104,7 +105,7 @@ private fun BaseExtension.sources(): List<Source> {
name = variant.name,
variantName = variant.name,
sourceDirectorySet = sourceSets[variant.name]
?: throw IllegalStateException("Couldn't find ${variant.name} in $sourceSets"),
?: project.objects.sourceDirectorySet(variant.name, "Empty kotlin source set"),
sourceSets = variant.sourceSets.map { it.name },
registerGeneratedDirectory = { outputDirectoryProvider ->
variant.addJavaSourceFoldersToModel(outputDirectoryProvider.get())
Expand Down