feat: update version to 1.10.0 and add withSurfRedis method for improved Redis integration

Author: twisti-dev

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

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

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/generators/pluginfiles/VelocityPluginFile.kt

@@ -82,6 +82,12 @@ class VelocityPluginFile(project: Project) : CommonPluginFile() {
                         optional = false
                     }
                 }
+
+                if (extension.withSurfRedis.isPresent && !extension.surfRedisRelocation.isPresent) {
+                    register("surf-redis-velocity") {
+                        optional = false
+                    }
+                }
             }
         }
 

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

@@ -20,6 +20,15 @@ open class CoreSurfExtension @Inject constructor(objects: ObjectFactory) :
     internal val surfDatabaseR2dbcVersion = objects.property<String>()
     internal val surfDatabaseR2dbcRelocation = objects.property<String>()
 
+    fun withSurfRedis() {
+        withSurfRedis.set(true)
+        withSurfRedis.finalizeValue()
+    }
+
+    @Deprecated(
+        level = DeprecationLevel.WARNING,
+        message = "Plugins no longer shade surf-redis. Use the standard withSurfRedis() method instead.",
+    )
     fun withSurfRedis(version: String, relocation: String) {
         withSurfRedis.set(true)
         withSurfRedis.finalizeValue()

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

@@ -1,13 +1,15 @@
 package dev.slne.surf.surfapi.gradle.platform.core
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import dev.slne.surf.surfapi.gradle.generated.Constants
 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
+import org.jetbrains.kotlin.gradle.utils.COMPILE_ONLY
 
 internal abstract class AbstractCoreSurfPlugin<E : CoreSurfExtension>(
     platformName: String, platform: SurfApiPlatform,
@@ -20,13 +22,18 @@ internal abstract class AbstractCoreSurfPlugin<E : CoreSurfExtension>(
 
     final override fun Project.afterEvaluated0(extension: E) {
         if (extension.withSurfRedis.get()) {
-            dependencies {
-                add(API, "dev.slne.surf:surf-redis:${extension.surfRedisVersion.get()}")
-            }
-
-            tasks.withType<ShadowJar>().configureEach {
-                doFirst {
-                    relocate("dev.slne.surf.redis", extension.surfRedisRelocation.get())
+            if (extension.surfRedisRelocation.isPresent) {
+                dependencies {
+                    add(API, "dev.slne.surf:surf-redis:${extension.surfRedisVersion.get()}")
+                }
+                tasks.withType<ShadowJar>().configureEach {
+                    doFirst {
+                        relocate("dev.slne.surf.redis", extension.surfRedisRelocation.get())
+                    }
+                }
+            } else {
+                dependencies {
+                    add(COMPILE_ONLY, "dev.slne.surf:surf-redis-api:${Constants.SURF_API_VERSION}")
                 }
             }
         }

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

@@ -67,6 +67,10 @@ internal class PaperPluginSurfPlugin :
                     registerRequired("surf-core-paper")
                 }
 
+                if (extension.withSurfRedis.isPresent && !extension.surfRedisRelocation.isPresent) {
+                    registerRequired("surf-redis-paper")
+                }
+
                 extension.serverDependencies.orNull?.execute(this)
             }
         }