feat: add support for configurable Redis dependency with relocation

Author: twisti-dev

surf-api-gradle-plugin/build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 group = groupId
 version = buildString {
     append(mcVersion)
-    append("-1.6.4")
+    append("-1.7.0")
     if (snapshot) append("-SNAPSHOT")
 }
 

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/core/CoreSurfExtension.kt

@@ -4,12 +4,26 @@ import dev.slne.surf.surfapi.gradle.SurfCloudModules
 import dev.slne.surf.surfapi.gradle.platform.common.CommonSurfExtension
 import org.gradle.api.model.ObjectFactory
 import org.gradle.kotlin.dsl.listProperty
+import org.gradle.kotlin.dsl.property
 import javax.inject.Inject
 
 open class CoreSurfExtension @Inject constructor(objects: ObjectFactory) :
     CommonSurfExtension(objects) {
     val authors = objects.listProperty<String>().convention(mutableListOf("SLNE Development"))
 
+    internal val withSurfRedis = objects.property<Boolean>().convention(false)
+    internal val surfRedisVersion = objects.property<String>()
+    internal val surfRedisRelocation = objects.property<String>()
+
+    fun withSurfRedis(version: String, relocation: String) {
+        withSurfRedis.set(true)
+        withSurfRedis.finalizeValue()
+        surfRedisVersion.set(version)
+        surfRedisVersion.finalizeValue()
+        surfRedisRelocation.set(relocation)
+        surfRedisRelocation.finalizeValue()
+    }
+
     fun withCloudCommon() {
         cloudModule.set(SurfCloudModules.COMMON)
     }

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/core/CoreSurfPlugin.kt

@@ -1,9 +1,13 @@
 package dev.slne.surf.surfapi.gradle.platform.core
 
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import dev.slne.surf.surfapi.gradle.platform.SurfApiPlatform
 import dev.slne.surf.surfapi.gradle.platform.common.CommonSurfPlugin
 import org.gradle.api.Project
 import org.gradle.api.model.ObjectFactory
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.utils.API
 
 internal abstract class AbstractCoreSurfPlugin<E : CoreSurfExtension>(
     platformName: String, platform: SurfApiPlatform,
@@ -13,9 +17,29 @@ internal abstract class AbstractCoreSurfPlugin<E : CoreSurfExtension>(
         "com.mojang.datafixers" relocatesTo "mojang.datafixers"
         "net.kyori.adventure.nbt" relocatesTo "kyori.nbt"
     }
+
+    final override fun Project.afterEvaluated0(extension: E) {
+        if (extension.withSurfRedis.get()) {
+            dependencies {
+                add(API, "dev.slne:surf-redis:${extension.surfRedisVersion.get()}")
+            }
+
+            tasks.withType<ShadowJar>().configureEach {
+                doFirst {
+                    relocate("dev.slne.redis", extension.surfRedisRelocation.get())
+                }
+            }
+        }
+
+        afterEvaluated1(extension)
+    }
+
+    protected open fun Project.afterEvaluated1(extension: E) {
+    }
 }
 
 internal class CoreSurfPlugin :
     AbstractCoreSurfPlugin<CoreSurfExtension>("core", SurfApiPlatform.CORE) {
-    override fun createExtension(objects: ObjectFactory, project: Project) = CoreSurfExtension(objects)
+    override fun createExtension(objects: ObjectFactory, project: Project) =
+        CoreSurfExtension(objects)
 }

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/paper/plugin/PaperPluginSurfExtension.kt

@@ -12,14 +12,12 @@ import javax.inject.Inject
 open class PaperPluginSurfExtension @Inject constructor(objects: ObjectFactory) :
     AbstractPaperSurfExtension(objects) {
     internal val mainClass = objects.property<String>()
-    internal val bootstrapper = objects.property<String>().convention(null)
+    internal val bootstrapper = objects.property<String>()
     internal val bootstrapDependencies =
         objects.property<Action<NamedDomainObjectContainerScope<PaperPluginDescription.DependencyDefinition>>>()
-            .convention(null)
     internal val serverDependencies =
         objects.property<Action<NamedDomainObjectContainerScope<PaperPluginDescription.DependencyDefinition>>>()
-            .convention(null)
-    internal val runServer = objects.property<Action<RunServer>>().convention(null)
+    internal val runServer = objects.property<Action<RunServer>>()
     internal val foliaSupported = objects.property<Boolean>().convention(false)
     internal val generateLibraryLoader = objects.property<Boolean>().convention(false)
 

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/paper/plugin/PaperPluginSurfPlugin.kt

@@ -32,7 +32,7 @@ internal class PaperPluginSurfPlugin :
         "de.eldoria.plugin-yml.paper"
     )
 
-    override fun Project.afterEvaluated0(extension: PaperPluginSurfExtension) {
+    override fun Project.afterEvaluated1(extension: PaperPluginSurfExtension) {
         val generateLoaderTask = generateLibrariesLoaderTask(
             extension.mainClass.get().substringBeforeLast('.')
         )