Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/main/groovy/dev/jbang/gradle/tasks/JBangTask.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import org.gradle.api.provider.ListProperty
import org.gradle.api.provider.Property
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputDirectory
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.Optional
import org.gradle.api.tasks.TaskAction
import org.gradle.api.tasks.options.Option
Expand Down Expand Up @@ -75,21 +76,20 @@ class JBangTask extends DefaultTask {
@Input
@Optional
final ListProperty<String> trusts
@InputDirectory
@Optional
@Internal
final DirectoryProperty installDir

@Inject
JBangTask(ObjectFactory objects) {
DirectoryProperty jbangCacheDirectory = project.objects.directoryProperty()
jbangCacheDirectory.set(new File(project.gradle.gradleUserHomeDir, 'caches/jbang'))

script = objects.property(String).convention('')
version = objects.property(String).convention('latest')
jbangArgs = objects.listProperty(String).convention([])
args = objects.listProperty(String).convention([])
trusts = objects.listProperty(String).convention([])
installDir = objects.directoryProperty().convention(jbangCacheDirectory.get())
installDir = objects.directoryProperty()

String userHome = System.getProperty('user.home')
installDir.convention(objects.directoryProperty().fileValue(new File(userHome, '.gradle' + File.separator + 'caches' + File.separator + 'jbang')))
}

@Option(option = 'jbang-script', description = 'The script to be executed by JBang (REQUIRED).')
Expand Down Expand Up @@ -123,6 +123,8 @@ class JBangTask extends DefaultTask {
throw new IllegalArgumentException("A value for script must be defined")
}

Files.createDirectories(installDir.get().asFile.toPath())

detectJBang()
executeTrust()
executeJBang()
Expand Down