Move DownloadService name to a constant

PaperMC · Nov 17, 2023 · 1d88d33 · 1d88d33
1 parent daab4fa
commit 1d88d33
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/PaperweightCore.kt b/paperweight-core/src/main/kotlin/io/papermc/paperweight/core/PaperweightCore.kt
@@ -48,7 +48,7 @@ class PaperweightCore : Plugin<Project> {
 
         val ext = target.extensions.create(PAPERWEIGHT_EXTENSION, PaperweightCoreExtension::class, target)
 
-        target.gradle.sharedServices.registerIfAbsent("download", DownloadService::class) {}
+        target.gradle.sharedServices.registerIfAbsent(DOWNLOAD_SERVICE_NAME, DownloadService::class) {}
 
         target.tasks.register<Delete>("cleanCache") {
             group = "paper"

diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/constants/constants.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/constants/constants.kt
@@ -115,6 +115,8 @@ const val IVY_REPOSITORY = "$PAPER_PATH/ivyRepository"
 
 const val RELOCATION_EXTENSION = "relocation"
 
+const val DOWNLOAD_SERVICE_NAME = "paperweightDownloadService"
+
 fun paperSetupOutput(name: String, ext: String) = "$SETUP_CACHE/$name.$ext"
 fun Task.paperTaskOutput(ext: String) = paperTaskOutput(name, ext)
 fun paperTaskOutput(name: String, ext: String) = "$TASK_CACHE/$name.$ext"
diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/utils.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/utils.kt
@@ -118,7 +118,7 @@ inline fun <reified T : Task> TaskContainer.configureTask(name: String, noinline
 
 @Suppress("UNCHECKED_CAST")
 val Project.download: Provider<DownloadService>
-    get() = gradle.sharedServices.registrations.getByName("download").service as Provider<DownloadService>
+    get() = gradle.sharedServices.registrations.getByName(DOWNLOAD_SERVICE_NAME).service as Provider<DownloadService>
 
 fun commentRegex(): Regex {
     return Regex("\\s*#.*")

diff --git a/paperweight-patcher/src/main/kotlin/io/papermc/paperweight/patcher/PaperweightPatcher.kt b/paperweight-patcher/src/main/kotlin/io/papermc/paperweight/patcher/PaperweightPatcher.kt
@@ -54,7 +54,7 @@ class PaperweightPatcher : Plugin<Project> {
 
         val patcher = target.extensions.create(PAPERWEIGHT_EXTENSION, PaperweightPatcherExtension::class, target)
 
-        target.gradle.sharedServices.registerIfAbsent("download", DownloadService::class) {}
+        target.gradle.sharedServices.registerIfAbsent(DOWNLOAD_SERVICE_NAME, DownloadService::class) {}
 
         target.tasks.register<Delete>("cleanCache") {
             group = "paperweight"

diff --git a/paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/PaperweightUser.kt b/paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/PaperweightUser.kt
@@ -75,7 +75,7 @@ abstract class PaperweightUser : Plugin<Project> {
             null
         }
 
-        target.gradle.sharedServices.registerIfAbsent("download", DownloadService::class) {}
+        target.gradle.sharedServices.registerIfAbsent(DOWNLOAD_SERVICE_NAME, DownloadService::class) {}
 
         val cleanAll = target.tasks.register<Delete>("cleanAllPaperweightUserdevCaches") {
             group = "paperweight"