style: Refine dependency extensions

Author: osipxd

src/main/kotlin/dependencies/Dependencies.kt

@@ -9,13 +9,14 @@ import org.gradle.api.artifacts.repositories.MavenArtifactRepository
 import org.gradle.api.plugins.ExtraPropertiesExtension
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.KotlinClosure0
-import org.gradle.kotlin.dsl.closureOf
 import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.maven
 import ru.endlesscode.bukkitgradle.bukkit
 import ru.endlesscode.bukkitgradle.meta.util.MinecraftVersion
 import ru.endlesscode.bukkitgradle.meta.util.parsedApiVersion
 
+private typealias RepositoryClosure = Closure<MavenArtifactRepository>
+
 internal object Dependencies {
 
     const val URL_SPIGOT = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/"
@@ -50,15 +51,15 @@ internal object Dependencies {
 
     private fun addGroovyExtensions() {
         val repoExtra = repoHandler.extra
-        repoExtra["spigot"] = closureOf<Any?> { repoHandler.addRepo("Spigot", URL_SPIGOT) }
-        repoExtra["sk89q"] = closureOf<Any?> { repoHandler.addRepo("sk89q", URL_SK89Q) }
-        repoExtra["papermc"] = closureOf<Any?> { repoHandler.addRepo("PaperMC", URL_PAPERMC) }
-        repoExtra["dmulloy2"] = closureOf<Any?> { repoHandler.addRepo("dmulloy2", URL_DMULLOY2) }
-        repoExtra["md5"] = closureOf<Any?> { repoHandler.addRepo("md5", URL_MD5) }
-        repoExtra["jitpack"] = closureOf<Any?> { repoHandler.addRepo("jitpack", URL_JITPACK) }
-        repoExtra["placeholderapi"] = closureOf<Any?> { repoHandler.addRepo("PlaceholderAPI", URL_PLACEHOLDERAPI) }
-        repoExtra["aikar"] = closureOf<Any?> { repoHandler.addRepo("aikar", URL_AIKAR) }
-        repoExtra["codemc"] = closureOf<Any?> { repoHandler.addRepo("codemc", URL_CODEMC) }
+        repoExtra["spigot"] = repoHandler.repositoryClosure("Spigot", URL_SPIGOT)
+        repoExtra["sk89q"] = repoHandler.repositoryClosure("sk89q", URL_SK89Q)
+        repoExtra["papermc"] = repoHandler.repositoryClosure("PaperMC", URL_PAPERMC)
+        repoExtra["dmulloy2"] = repoHandler.repositoryClosure("dmulloy2", URL_DMULLOY2)
+        repoExtra["md5"] = repoHandler.repositoryClosure("md5", URL_MD5)
+        repoExtra["jitpack"] = repoHandler.repositoryClosure("jitpack", URL_JITPACK)
+        repoExtra["placeholderapi"] = repoHandler.repositoryClosure("PlaceholderAPI", URL_PLACEHOLDERAPI)
+        repoExtra["aikar"] = repoHandler.repositoryClosure("aikar", URL_AIKAR)
+        repoExtra["codemc"] = repoHandler.repositoryClosure("codemc", URL_CODEMC)
 
         val depExtra = depHandler.extra
         depExtra["spigot"] = depClosureOf { depHandler.api("org.spigotmc", "spigot", "mavenLocal") }
@@ -67,12 +68,18 @@ internal object Dependencies {
         depExtra["paperApi"] = depClosureOf { depHandler.api(resolvePaperGroupId(), "paper-api", "papermc") }
     }
 
+    private fun RepositoryHandler.repositoryClosure(name: String, url: String): RepositoryClosure =
+        object : RepositoryClosure(this, this) {
+            @Suppress("unused") // to be called dynamically by Groovy
+            fun doCall() = (delegate as RepositoryHandler).addRepo(name, url)
+        }
+
     fun RepositoryHandler.addRepo(
         repoName: String,
         repoUrl: String,
         configure: MavenArtifactRepository.() -> Unit = {}
-    ) {
-        maven(repoUrl) {
+    ): MavenArtifactRepository {
+        return maven(repoUrl) {
             name = repoName
             configure()
         }
@@ -89,7 +96,8 @@ internal object Dependencies {
             if (repo == "mavenLocal") {
                 repoHandler.mavenLocal()
             } else {
-                (repoHandler.extra[repo] as Closure<*>).call(repoHandler)
+                @Suppress("UNCHECKED_CAST")
+                (repoHandler.extra[repo] as RepositoryClosure).call()
             }
         }
 

src/main/kotlin/dependencies/DependenciesExtensions.kt

@@ -1,3 +1,5 @@
+@file:Suppress("SpellCheckingInspection")
+
 package ru.endlesscode.bukkitgradle.dependencies
 
 import org.gradle.api.artifacts.dsl.DependencyHandler
@@ -16,41 +18,32 @@ import ru.endlesscode.bukkitgradle.dependencies.Dependencies.addRepo
 import ru.endlesscode.bukkitgradle.dependencies.Dependencies.api
 import ru.endlesscode.bukkitgradle.dependencies.Dependencies.resolvePaperGroupId
 
-public fun RepositoryHandler.spigot(configure: MavenArtifactRepository.() -> Unit = {}) {
+public fun RepositoryHandler.spigot(configure: MavenArtifactRepository.() -> Unit = {}): MavenArtifactRepository =
     addRepo("Spigot", URL_SPIGOT, configure)
-}
 
-public fun RepositoryHandler.sk89q(configure: MavenArtifactRepository.() -> Unit = {}) {
+public fun RepositoryHandler.sk89q(configure: MavenArtifactRepository.() -> Unit = {}): MavenArtifactRepository =
     addRepo("sk89q", URL_SK89Q, configure)
-}
 
-public fun RepositoryHandler.papermc(configure: MavenArtifactRepository.() -> Unit = {}) {
+public fun RepositoryHandler.papermc(configure: MavenArtifactRepository.() -> Unit = {}): MavenArtifactRepository =
     addRepo("PaperMC", URL_PAPERMC, configure)
-}
 
-public fun RepositoryHandler.dmulloy2(configure: MavenArtifactRepository.() -> Unit = {}) {
+public fun RepositoryHandler.dmulloy2(configure: MavenArtifactRepository.() -> Unit = {}): MavenArtifactRepository =
     addRepo("dmulloy2", URL_DMULLOY2, configure)
-}
 
-public fun RepositoryHandler.md5(configure: MavenArtifactRepository.() -> Unit = {}) {
+public fun RepositoryHandler.md5(configure: MavenArtifactRepository.() -> Unit = {}): MavenArtifactRepository =
     addRepo("md5", URL_MD5, configure)
-}
 
-public fun RepositoryHandler.jitpack(configure: MavenArtifactRepository.() -> Unit = {}) {
+public fun RepositoryHandler.jitpack(configure: MavenArtifactRepository.() -> Unit = {}): MavenArtifactRepository =
     addRepo("jitpack", URL_JITPACK, configure)
-}
 
-public fun RepositoryHandler.placeholderApi(configure: MavenArtifactRepository.() -> Unit = {}) {
+public fun RepositoryHandler.placeholderApi(configure: MavenArtifactRepository.() -> Unit = {}): MavenArtifactRepository =
     addRepo("PlaceholderAPI", URL_PLACEHOLDERAPI, configure)
-}
 
-public fun RepositoryHandler.aikar(configure: MavenArtifactRepository.() -> Unit = {}) {
+public fun RepositoryHandler.aikar(configure: MavenArtifactRepository.() -> Unit = {}): MavenArtifactRepository =
     addRepo("aikar", URL_AIKAR, configure)
-}
 
-public fun RepositoryHandler.codemc(configure: MavenArtifactRepository.() -> Unit = {}) {
+public fun RepositoryHandler.codemc(configure: MavenArtifactRepository.() -> Unit = {}): MavenArtifactRepository =
     addRepo("codemc", URL_CODEMC, configure)
-}
 
 public val DependencyHandler.spigot: String
     get() = api("org.spigotmc", "spigot", "mavenLocal")