feat: introduce SurfCloudModules enum and extend cloud module functionality in extensions

Author: twisti-dev

.idea/modules.xml

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

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

@@ -0,0 +1,9 @@
+package dev.slne.surf.surfapi.gradle
+
+enum class SurfCloudModules(val module: String) {
+    COMMON("surf-cloud-api-common"),
+    CLIENT_COMMON("surf-cloud-api-client-common"),
+    CLIENT_PAPER("surf-cloud-api-client-paper"),
+    CLIENT_VELOCITY("surf-cloud-api-client-velocity"),
+    SERVER("surf-cloud-api-server"),
+}

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/SurfCloudModules.kt

@@ -1,5 +1,6 @@
 package dev.slne.surf.surfapi.gradle.platform.common
 
+import dev.slne.surf.surfapi.gradle.SurfCloudModules
 import org.gradle.api.model.ObjectFactory
 import org.gradle.kotlin.dsl.property
 import org.jetbrains.annotations.MustBeInvokedByOverriders
@@ -9,6 +10,7 @@ abstract class CommonSurfExtension(protected val objects: ObjectFactory) {
     internal val surfApiScope = objects.property<String>()
     internal val publishingUrl = objects.property<String>().convention("https://repo.slne.dev/repository/maven-releases")
     internal val publishingRepoName = objects.property<String>().convention("maven-releases")
+    internal val cloudModule = objects.property<SurfCloudModules>()
 
     fun addSurfApiToClasspath(value: Boolean) {
         addSurfApiToClasspath.set(value)

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/common/CommonSurfExtension.kt

@@ -17,6 +17,7 @@ import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.allopen.gradle.AllOpenExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.utils.COMPILE_ONLY
+import org.jetbrains.kotlin.gradle.utils.IMPLEMENTATION
 
 abstract class CommonSurfPlugin<E : CommonSurfExtension>(
     protected val platformName: String,
@@ -130,8 +131,6 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
                     .distinct()
                     .toList()
 
-                println("contains surf-cloud-api-common: ${deps.any { it.contains("surf-cloud-api-common") }}")
-
                 dependencyDependentRelocations.forEach { (dependency, relocations) ->
                     if (deps.any { it.contains(dependency) }) {
                         logger.warn("Dependency $dependency found. Applying relocations.")
@@ -190,6 +189,20 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
             }
         }
 
+        val cloudModule = extension.cloudModule.orNull
+        if (cloudModule != null) {
+            dependencies {
+                add(
+                    IMPLEMENTATION,
+                    platform("dev.slne.surf.cloud:surf-cloud-bom:${Constants.SURF_API_VERSION}")
+                )
+                add(
+                    COMPILE_ONLY,
+                    "dev.slne.surf.cloud:${cloudModule.module}:${Constants.SURF_API_VERSION}"
+                )
+            }
+        }
+
         afterEvaluated0(extension)
     }
 

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/common/CommonSurfPlugin.kt

@@ -1,5 +1,6 @@
 package dev.slne.surf.surfapi.gradle.platform.core
 
+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
@@ -8,4 +9,16 @@ import javax.inject.Inject
 open class CoreSurfExtension @Inject constructor(objects: ObjectFactory) :
     CommonSurfExtension(objects) {
     val authors = objects.listProperty<String>().convention(mutableListOf("SLNE Development"))
+
+    fun withCloudCommon() {
+        cloudModule.set(SurfCloudModules.COMMON)
+    }
+
+    fun withCloudClientCommon() {
+        cloudModule.set(SurfCloudModules.CLIENT_COMMON)
+    }
+
+    fun withCloudServer() {
+        cloudModule.set(SurfCloudModules.SERVER)
+    }
 }

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

@@ -1,7 +1,11 @@
 package dev.slne.surf.surfapi.gradle.platform.paper
 
+import dev.slne.surf.surfapi.gradle.SurfCloudModules
 import dev.slne.surf.surfapi.gradle.platform.core.CoreSurfExtension
 import org.gradle.api.model.ObjectFactory
 
 abstract class AbstractPaperSurfExtension(objects: ObjectFactory) : CoreSurfExtension(objects) {
+    fun withCloudClientPaper() {
+        cloudModule.set(SurfCloudModules.CLIENT_PAPER)
+    }
 }

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

@@ -1,5 +1,6 @@
 package dev.slne.surf.surfapi.gradle.platform.velocity
 
+import dev.slne.surf.surfapi.gradle.SurfCloudModules
 import dev.slne.surf.surfapi.gradle.platform.core.CoreSurfExtension
 import org.gradle.api.Project
 import org.gradle.api.model.ObjectFactory
@@ -9,4 +10,8 @@ open class VelocitySurfExtension @Inject constructor(
     private val project: Project,
     objects: ObjectFactory,
 ) : CoreSurfExtension(objects) {
+
+    fun withCloudClientVelocity() {
+        cloudModule.set(SurfCloudModules.CLIENT_VELOCITY)
+    }
 }