Skip to content

Commit 5c78f5f

Browse files
committed
feat: add dependOnCloudPlugin support and bump version to 1.6.0
- Introduced `dependOnCloudPlugin` method in `VelocitySurfExtension` and `PaperPluginSurfExtension` for conditional dependency on cloud modules. - Added internal `dependOnCloud` property to manage cloud dependency logic. - Updated dependency registration to account for the `dependOnCloud` setting. - Bumped plugin version to 1.6.0.
1 parent 85d80ec commit 5c78f5f

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020
group = groupId
2121
version = buildString {
2222
append(mcVersion)
23-
append("-1.5.3")
23+
append("-1.6.0")
2424
if (snapshot) append("-SNAPSHOT")
2525
}
2626

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ abstract class CommonSurfExtension(protected val objects: ObjectFactory) {
1111
internal val publishingUrl = objects.property<String>().convention("https://repo.slne.dev/repository/maven-releases")
1212
internal val publishingRepoName = objects.property<String>().convention("maven-releases")
1313
internal val cloudModule = objects.property<SurfCloudModules>()
14+
internal val dependOnCloud = objects.property<Boolean>().convention(true)
1415
internal val migrationMainClass = objects.property<String>()
1516

1617
fun addSurfApiToClasspath(value: Boolean) {

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ open class PaperPluginSurfExtension @Inject constructor(objects: ObjectFactory)
5858
this.generateLibraryLoader.finalizeValue()
5959
}
6060

61+
fun dependOnCloudPlugin(value: Boolean) {
62+
dependOnCloud.set(value)
63+
dependOnCloud.finalizeValue()
64+
}
65+
6166
override fun validate() {
6267
super.validate()
6368
require(mainClass.isPresent) { "Main class must be set to your plugin's main class" }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ internal class PaperPluginSurfPlugin :
5151

5252
bootstrapDependencies {
5353
registerRequired("surf-bukkit-api")
54-
if (extension.cloudModule.isPresent) {
54+
if (extension.cloudModule.isPresent && extension.dependOnCloud.get()) {
5555
registerRequired("surf-cloud-bukkit")
5656
}
5757

@@ -60,7 +60,7 @@ internal class PaperPluginSurfPlugin :
6060

6161
serverDependencies {
6262
registerRequired("surf-bukkit-api")
63-
if (extension.cloudModule.isPresent) {
63+
if (extension.cloudModule.isPresent && extension.dependOnCloud.get()) {
6464
registerRequired("surf-cloud-bukkit")
6565
}
6666
extension.serverDependencies.orNull?.execute(this)

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/velocity/VelocitySurfExtension.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,9 @@ open class VelocitySurfExtension @Inject constructor(
1414
fun withCloudClientVelocity() {
1515
cloudModule.set(SurfCloudModules.CLIENT_VELOCITY)
1616
}
17+
18+
fun dependOnCloudPlugin(value: Boolean) {
19+
dependOnCloud.set(value)
20+
dependOnCloud.finalizeValue()
21+
}
1722
}

0 commit comments

Comments
 (0)