Download service: Convert to stable API with @internal and instanciat…

…e for each subproject
infolektuell · Sep 25, 2024 · a30fe12 · a30fe12
1 parent c32c84d
commit a30fe12
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/plugin/src/main/kotlin/de/infolektuell/gradle/download/GradleDownloadPlugin.kt b/plugin/src/main/kotlin/de/infolektuell/gradle/download/GradleDownloadPlugin.kt
@@ -8,13 +8,17 @@ import org.gradle.api.Project
 
 abstract class GradleDownloadPlugin : Plugin<Project> {
     override fun apply(project: Project) {
-        project.gradle.sharedServices.registerIfAbsent(DownloadClient.SERVICE_NAME, DownloadClient::class.java)
+        val serviceProvider = project.gradle.sharedServices.registerIfAbsent("${project.name}_${DownloadClient.SERVICE_NAME}", DownloadClient::class.java)
+        project.tasks.withType(DownloadTask::class.java).configureEach { task ->
+            task.group = "download"
+            task.downloadClient.set(serviceProvider)
+            task.usesService(serviceProvider)
+        }
         val extension = project.extensions.create(DownloadExtension.EXTENSION_NAME, DownloadExtension::class.java)
         extension.targetDirectory.convention(project.layout.buildDirectory.dir("downloads"))
         extension.resources.all { resource ->
             resource.target.convention(extension.targetDirectory.file(resource.source.map { it.path.replaceBeforeLast("/", "").trim('/') }))
             project.tasks.register("${resource.name}Download", DownloadTask::class.java) { task ->
-                task.group = "download"
                 task.source.set(resource.source)
                 task.target.set(resource.target)
                 task.integrity.set(resource.integrity)

diff --git a/plugin/src/main/kotlin/de/infolektuell/gradle/download/tasks/DownloadTask.kt b/plugin/src/main/kotlin/de/infolektuell/gradle/download/tasks/DownloadTask.kt
@@ -4,16 +4,12 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
-import org.gradle.api.services.ServiceReference
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.*
 import java.net.URI
 import java.nio.file.Files
 
 abstract class DownloadTask : DefaultTask() {
-    @get:ServiceReference(DownloadClient.SERVICE_NAME)
+    @get:Internal
     abstract val downloadClient: Property<DownloadClient>
     @get:Input
     abstract val source: Property<URI>

diff --git a/plugin/src/main/kotlin/de/infolektuell/gradle/jextract/GradleJextractPlugin.kt b/plugin/src/main/kotlin/de/infolektuell/gradle/jextract/GradleJextractPlugin.kt
@@ -26,7 +26,6 @@ abstract class GradleJextractPlugin : Plugin<Project> {
         val userOutput = project.layout.projectDirectory.dir(project.gradle.gradleUserHomeDir.absolutePath)
         val resource: ResourceHandler = extension.generator.distribution.currentResource()
         val downloadTask = project.tasks.register("downloadJextract", DownloadTask::class.java) { task ->
-            task.group = "download"
             task.description = "Downloads Jextract for ${resource.name} platform"
             task.source.set(resource.url)
             task.target.set(userOutput.dir("downloads").file(resource.url.map { it.path.replaceBeforeLast("/", "").trim('/') }))