Skip to content

Commit c41d158

Browse files
twisti-devtwisti-dev
committed
feat: update version to 1.11.0 and add support for surf-redis and surf-database-r2dbc properties
1 parent cf83c52 commit c41d158

5 files changed

Lines changed: 65 additions & 72 deletions

File tree

‎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.10.0")
23+
append("-1.11.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: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,40 @@ abstract class CommonSurfExtension(protected val objects: ObjectFactory) {
1616
internal val coreModule = objects.property<SurfCoreModules>()
1717
internal val dependOnCloud = objects.property<Boolean>().convention(true)
1818
internal val migrationMainClass = objects.property<String>()
19+
internal val withSurfRedis = objects.property<Boolean>().convention(false)
20+
internal val surfRedisVersion = objects.property<String>()
21+
internal val surfRedisRelocation = objects.property<String>()
22+
internal val withSurfDatabaseR2dbc = objects.property<Boolean>().convention(false)
23+
internal val surfDatabaseR2dbcVersion = objects.property<String>()
24+
internal val surfDatabaseR2dbcRelocation = objects.property<String>()
25+
26+
fun withSurfRedis() {
27+
withSurfRedis.set(true)
28+
withSurfRedis.finalizeValue()
29+
}
30+
31+
@Deprecated(
32+
level = DeprecationLevel.WARNING,
33+
message = "Plugins no longer shade surf-redis. Use the standard withSurfRedis() method instead.",
34+
replaceWith = ReplaceWith("withSurfRedis()")
35+
)
36+
fun withSurfRedis(version: String, relocation: String) {
37+
withSurfRedis.set(true)
38+
withSurfRedis.finalizeValue()
39+
surfRedisVersion.set(version)
40+
surfRedisVersion.finalizeValue()
41+
surfRedisRelocation.set(relocation)
42+
surfRedisRelocation.finalizeValue()
43+
}
44+
45+
fun withSurfDatabaseR2dbc(version: String, relocation: String) {
46+
withSurfDatabaseR2dbc.set(true)
47+
withSurfDatabaseR2dbc.finalizeValue()
48+
surfDatabaseR2dbcVersion.set(version)
49+
surfDatabaseR2dbcVersion.finalizeValue()
50+
surfDatabaseR2dbcRelocation.set(relocation)
51+
surfDatabaseR2dbcRelocation.finalizeValue()
52+
}
1953

2054
fun addSurfApiToClasspath(value: Boolean) {
2155
addSurfApiToClasspath.set(value)

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import org.gradle.api.tasks.compile.JavaCompile
1818
import org.gradle.kotlin.dsl.*
1919
import org.jetbrains.kotlin.allopen.gradle.AllOpenExtension
2020
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
21+
import org.jetbrains.kotlin.gradle.utils.API
2122
import org.jetbrains.kotlin.gradle.utils.COMPILE_ONLY
2223
import org.jetbrains.kotlin.gradle.utils.IMPLEMENTATION
2324

@@ -254,6 +255,35 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
254255
}
255256
}
256257

258+
if (extension.withSurfRedis.get()) {
259+
if (extension.surfRedisRelocation.isPresent) {
260+
dependencies {
261+
add(API, "dev.slne.surf:surf-redis:${extension.surfRedisVersion.get()}")
262+
}
263+
tasks.withType<ShadowJar>().configureEach {
264+
doFirst {
265+
relocate("dev.slne.surf.redis", extension.surfRedisRelocation.get())
266+
}
267+
}
268+
} else {
269+
dependencies {
270+
add(COMPILE_ONLY, "dev.slne.surf:surf-redis-api:${Constants.SURF_API_VERSION}")
271+
}
272+
}
273+
}
274+
275+
if (extension.withSurfDatabaseR2dbc.get()) {
276+
dependencies {
277+
add(API, "dev.slne.surf:surf-database-r2dbc:${extension.surfDatabaseR2dbcVersion.get()}")
278+
}
279+
280+
tasks.withType<ShadowJar>().configureEach {
281+
doFirst {
282+
relocate("dev.slne.surf.database", extension.surfDatabaseR2dbcRelocation.get())
283+
}
284+
}
285+
}
286+
257287
afterEvaluated0(extension)
258288
}
259289

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,12 @@ import dev.slne.surf.surfapi.gradle.SurfCoreModules
55
import dev.slne.surf.surfapi.gradle.platform.common.CommonSurfExtension
66
import org.gradle.api.model.ObjectFactory
77
import org.gradle.kotlin.dsl.listProperty
8-
import org.gradle.kotlin.dsl.property
98
import javax.inject.Inject
109

1110
open class CoreSurfExtension @Inject constructor(objects: ObjectFactory) :
1211
CommonSurfExtension(objects) {
1312
val authors = objects.listProperty<String>().convention(mutableListOf("SLNE Development"))
1413

15-
internal val withSurfRedis = objects.property<Boolean>().convention(false)
16-
internal val surfRedisVersion = objects.property<String>()
17-
internal val surfRedisRelocation = objects.property<String>()
18-
19-
internal val withSurfDatabaseR2dbc = objects.property<Boolean>().convention(false)
20-
internal val surfDatabaseR2dbcVersion = objects.property<String>()
21-
internal val surfDatabaseR2dbcRelocation = objects.property<String>()
22-
23-
fun withSurfRedis() {
24-
withSurfRedis.set(true)
25-
withSurfRedis.finalizeValue()
26-
}
27-
28-
@Deprecated(
29-
level = DeprecationLevel.WARNING,
30-
message = "Plugins no longer shade surf-redis. Use the standard withSurfRedis() method instead.",
31-
replaceWith = ReplaceWith("withSurfRedis()")
32-
)
33-
fun withSurfRedis(version: String, relocation: String) {
34-
withSurfRedis.set(true)
35-
withSurfRedis.finalizeValue()
36-
surfRedisVersion.set(version)
37-
surfRedisVersion.finalizeValue()
38-
surfRedisRelocation.set(relocation)
39-
surfRedisRelocation.finalizeValue()
40-
}
41-
42-
fun withSurfDatabaseR2dbc(version: String, relocation: String) {
43-
withSurfDatabaseR2dbc.set(true)
44-
withSurfDatabaseR2dbc.finalizeValue()
45-
surfDatabaseR2dbcVersion.set(version)
46-
surfDatabaseR2dbcVersion.finalizeValue()
47-
surfDatabaseR2dbcRelocation.set(relocation)
48-
surfDatabaseR2dbcRelocation.finalizeValue()
49-
}
5014

5115
fun withCloudCommon() {
5216
cloudModule.set(SurfCloudModules.COMMON)

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

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
package dev.slne.surf.surfapi.gradle.platform.core
22

3-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
4-
import dev.slne.surf.surfapi.gradle.generated.Constants
53
import dev.slne.surf.surfapi.gradle.platform.SurfApiPlatform
64
import dev.slne.surf.surfapi.gradle.platform.common.CommonSurfPlugin
75
import org.gradle.api.Project
86
import org.gradle.api.model.ObjectFactory
9-
import org.gradle.kotlin.dsl.dependencies
10-
import org.gradle.kotlin.dsl.withType
11-
import org.jetbrains.kotlin.gradle.utils.API
12-
import org.jetbrains.kotlin.gradle.utils.COMPILE_ONLY
137

148
internal abstract class AbstractCoreSurfPlugin<E : CoreSurfExtension>(
159
platformName: String, platform: SurfApiPlatform,
@@ -21,35 +15,6 @@ internal abstract class AbstractCoreSurfPlugin<E : CoreSurfExtension>(
2115
}
2216

2317
final override fun Project.afterEvaluated0(extension: E) {
24-
if (extension.withSurfRedis.get()) {
25-
if (extension.surfRedisRelocation.isPresent) {
26-
dependencies {
27-
add(API, "dev.slne.surf:surf-redis:${extension.surfRedisVersion.get()}")
28-
}
29-
tasks.withType<ShadowJar>().configureEach {
30-
doFirst {
31-
relocate("dev.slne.surf.redis", extension.surfRedisRelocation.get())
32-
}
33-
}
34-
} else {
35-
dependencies {
36-
add(COMPILE_ONLY, "dev.slne.surf:surf-redis-api:${Constants.SURF_API_VERSION}")
37-
}
38-
}
39-
}
40-
41-
if (extension.withSurfDatabaseR2dbc.get()) {
42-
dependencies {
43-
add(API, "dev.slne.surf:surf-database-r2dbc:${extension.surfDatabaseR2dbcVersion.get()}")
44-
}
45-
46-
tasks.withType<ShadowJar>().configureEach {
47-
doFirst {
48-
relocate("dev.slne.surf.database", extension.surfDatabaseR2dbcRelocation.get())
49-
}
50-
}
51-
}
52-
5318
afterEvaluated1(extension)
5419
}
5520

0 commit comments

Comments
 (0)