Skip to content

Commit

Permalink
Remove erroneous imports and update resourcesDirs convention (#402)
Browse files Browse the repository at this point in the history
Generated accessors should not be imported. Use project accessors instead
  • Loading branch information
lamba92 committed Jun 13, 2024
1 parent 401f89c commit f96f878
Showing 1 changed file with 12 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package org.jetbrains.jewel.buildlogic.demodata

import com.squareup.kotlinpoet.ClassName
import gradle.kotlin.dsl.accessors._2568f72cb9e4ce984c7f1bb76d889841.main
import gradle.kotlin.dsl.accessors._2568f72cb9e4ce984c7f1bb76d889841.sourceSets
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.decodeFromStream
import org.gradle.api.DefaultTask
Expand All @@ -13,7 +11,11 @@ import org.gradle.api.provider.Property
import org.gradle.api.provider.SetProperty
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.SourceSetContainer
import org.gradle.api.tasks.TaskAction
import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.hasPlugin
import org.gradle.kotlin.dsl.property
import org.gradle.kotlin.dsl.setProperty
import java.io.File
Expand All @@ -29,7 +31,14 @@ open class StudioVersionsGenerationExtension(project: Project) {
val resourcesDirs: SetProperty<File> =
project.objects
.setProperty<File>()
.convention(project.sourceSets.main.get().resources.srcDirs)
.convention(project.provider {
when {
project.plugins.hasPlugin("org.gradle.jvm-ecosystem") ->
project.extensions.getByType<SourceSetContainer>()["main"]
.resources.srcDirs
else -> emptySet()
}
})

val dataUrl: Property<String> =
project.objects
Expand Down

0 comments on commit f96f878

Please sign in to comment.