Skip to content

Commit a58b1ac

Browse files
ammodevammodev
authored
chore: update group ID and versioning scheme, adjust repository URLs (#293)
2 parents 04bfdc2 + e264f6b commit a58b1ac

11 files changed

Lines changed: 30 additions & 136 deletions

File tree

‎buildSrc/src/main/kotlin/core-convention.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ version = findProperty("version") as String + if (snapshot) "-SNAPSHOT" else ""
2424

2525
repositories {
2626
mavenCentral()
27-
maven("https://repo.slne.dev/repository/maven-public") { name = "maven-public" }
27+
maven("https://reposilite.slne.dev/public") { name = "slne-repository-public" }
2828
}
2929

3030
dependencies {

‎buildSrc/src/main/kotlin/publish-convention.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44

55
publishing {
66
repositories {
7-
maven("https://repo.slne.dev/repository/maven-releases/") {
8-
name = "maven-releases"
7+
maven("https://reposilite.slne.dev/releases/") {
8+
name = "slne-repository-releases"
99
credentials {
1010
username = System.getenv("SLNE_RELEASES_REPO_USERNAME")
1111
password = System.getenv("SLNE_RELEASES_REPO_PASSWORD")

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx8G
66
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
77
javaVersion=25
88
mcVersion=26.1.1
9-
group=dev.slne.surf
10-
version=26.1.1-3.0.3
9+
group=dev.slne.surf.api
10+
version=3.0.3
1111
relocationPrefix=dev.slne.surf.api.libs
1212
snapshot=false

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ brigadier = { module = "com.mojang:brigadier", version.ref = "brigadier" }
144144
configurate-yaml = { module = "org.spongepowered:configurate-yaml", version.ref = "configurate" }
145145
configurate-jackson = { module = "org.spongepowered:configurate-jackson", version.ref = "configurate" }
146146
configurate-kotlin = { module = "org.spongepowered:configurate-extra-kotlin", version.ref = "configurate" }
147-
more-persistent-data-types = { module = "com.jeff_media:MorePersistentDataTypes", version.ref = "more-persistent-data-types" }
147+
more-persistent-data-types = { module = "com.jeff-media:MorePersistentDataTypes", version.ref = "more-persistent-data-types" }
148148
inventory-framework-platform-paper = { module = "me.devnatan:inventory-framework-platform-paper", version.ref = "inventory-framework" }
149149
inventory-framework-platform-bukkit = { module = "me.devnatan:inventory-framework-platform-bukkit", version.ref = "inventory-framework" }
150150
flogger = { module = "com.google.flogger:flogger", version.ref = "flogger" }

‎surf-api-gradle-plugin/README.md‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ plugins {
2020

2121
group = groupId
2222
version = buildString {
23-
append(mcVersion)
24-
append("-2.0.3")
23+
append("2.0.3")
2524
if (snapshot) append("-SNAPSHOT")
2625
}
2726

@@ -86,12 +85,10 @@ gradlePlugin {
8685

8786
publishing {
8887
repositories {
89-
maven("https://repo.slne.dev/repository/maven-releases/") {
90-
name = "maven-releases"
88+
maven("https://reposilite.slne.dev/releases/") {
89+
name = "slne-repository-releases"
9190
credentials {
92-
val getenv = System.getenv("SLNE_RELEASES_REPO_USERNAME")
93-
94-
username = getenv
91+
username = System.getenv("SLNE_RELEASES_REPO_USERNAME")
9592
password = System.getenv("SLNE_RELEASES_REPO_PASSWORD")
9693
}
9794
}
@@ -131,8 +128,8 @@ val generateConstants by tasks.registering {
131128
|
132129
|internal object Constants {
133130
| const val RELOCATION_PREFIX = "$relocationPrefix"
134-
| const val SNAPSHOT_REPO_ID = "maven-releases"
135-
| const val SNAPSHOT_REPO = "https://repo.slne.dev/repository/maven-releases"
131+
| const val SNAPSHOT_REPO_ID = "slne-repository-releases"
132+
| const val SNAPSHOT_REPO = "https://reposilite.slne.dev/releases"
136133
| const val PAPER_API = "${libs.paper.api.get()}"
137134
| const val CANVAS_API = "${libs.canvas.api.get()}"
138135
| const val VELOCITY_API = "${libs.velocity.api.get()}"

‎surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/api/gradle/platform/SurfApiPlatform.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import org.jetbrains.kotlin.gradle.utils.API
55
import org.jetbrains.kotlin.gradle.utils.COMPILE_ONLY
66

77
enum class SurfApiPlatform(val dependency: String, val scope: String = COMPILE_ONLY) {
8-
CORE("dev.slne.surf:surf-api-core:${Constants.SURF_API_VERSION}"),
9-
PAPER("dev.slne.surf:surf-api-paper:${Constants.SURF_API_VERSION}"),
10-
VELOCITY("dev.slne.surf:surf-api-velocity:${Constants.SURF_API_VERSION}"),
11-
STANDALONE("dev.slne.surf:surf-api-standalone:${Constants.SURF_API_VERSION}", API),
8+
CORE("dev.slne.surf.api:surf-api-core:${Constants.SURF_API_VERSION}"),
9+
PAPER("dev.slne.surf.api:surf-api-paper:${Constants.SURF_API_VERSION}"),
10+
VELOCITY("dev.slne.surf.api:surf-api-velocity:${Constants.SURF_API_VERSION}"),
11+
STANDALONE("dev.slne.surf.api:surf-api-standalone:${Constants.SURF_API_VERSION}", API),
1212
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ abstract class CommonSurfExtension(protected val objects: ObjectFactory) {
99
internal val addSurfApiToClasspath = objects.property<Boolean>().convention(true)
1010
internal val surfApiScope = objects.property<String>()
1111
internal val publishingUrl =
12-
objects.property<String>().convention("https://repo.slne.dev/repository/maven-releases")
13-
internal val publishingRepoName = objects.property<String>().convention("maven-releases")
12+
objects.property<String>().convention("https://reposilite.slne.dev/releases")
13+
internal val publishingRepoName =
14+
objects.property<String>().convention("slne-repository-releases")
1415
internal val coreModule = objects.property<SurfCoreModules>()
1516
internal val withSurfRedis = objects.property<Boolean>().convention(false)
1617
internal val surfRedisVersion = objects.property<String>()

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,15 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
219219
dependencies {
220220
add(
221221
COMPILE_ONLY,
222-
"dev.slne.surf.core:${it.module}:${Constants.SURF_API_VERSION}"
222+
"dev.slne.surf.core:${it.module}:+"
223223
)
224224
}
225225
}
226226

227227
if (extension.withSurfRedis.get()) {
228228
if (extension.surfRedisRelocation.isPresent) {
229229
dependencies {
230-
add(API, "dev.slne.surf.redis:surf-redis:${extension.surfRedisVersion.get()}")
230+
add(API, "dev.slne.surf.redis:surf-redis:+")
231231
}
232232
tasks.withType<ShadowJar>().configureEach {
233233
doFirst {
@@ -238,7 +238,7 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
238238
dependencies {
239239
add(
240240
COMPILE_ONLY,
241-
"dev.slne.surf.redis:surf-redis-api:${Constants.SURF_API_VERSION}"
241+
"dev.slne.surf.redis:surf-redis-api:+"
242242
)
243243
}
244244
}
@@ -248,7 +248,7 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
248248
dependencies {
249249
add(
250250
API,
251-
"dev.slne.surf:surf-database-r2dbc:${extension.surfDatabaseR2dbcVersion.get()}"
251+
"dev.slne.surf:surf-database-r2dbc:+"
252252
)
253253
}
254254

‎surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/api/gradle/util/repo-extensions.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const val DEFAULT_USERNAME_RELEASES = "SLNE_RELEASES_REPO_USERNAME"
1111
const val DEFAULT_PASSWORD_RELEASES = "SLNE_RELEASES_REPO_PASSWORD"
1212

1313
inline fun RepositoryHandler.slnePublic(crossinline block: MavenArtifactRepository.() -> Unit = {}) =
14-
maven("https://repo.slne.dev/repository/maven-public/") {
15-
name = "maven-public"
14+
maven("https://reposilite.slne.dev/public/") {
15+
name = "slne-repository-public"
1616
block()
1717
}
1818

@@ -23,8 +23,8 @@ inline fun RepositoryHandler.canvasMaven(crossinline block: MavenArtifactReposit
2323
}
2424

2525
inline fun RepositoryHandler.slneReleases(crossinline block: MavenArtifactRepository.() -> Unit = {}) =
26-
maven("https://repo.slne.dev/repository/maven-releases/") {
27-
name = "maven-releases"
26+
maven("https://reposilite.slne.dev/releases/") {
27+
name = "slne-repository-releases"
2828
credentials {
2929
username = System.getenv(DEFAULT_USERNAME_RELEASES)
3030
password = System.getenv(DEFAULT_PASSWORD_RELEASES)
@@ -34,8 +34,8 @@ inline fun RepositoryHandler.slneReleases(crossinline block: MavenArtifactReposi
3434
}
3535

3636
inline fun RepositoryHandler.slnePrivate(crossinline block: MavenArtifactRepository.() -> Unit = {}) =
37-
maven("https://repo.slne.dev/repository/maven-private/") {
38-
name = "maven-private"
37+
maven("https://reposilite.slne.dev/private/") {
38+
name = "slne-repository-private"
3939
credentials {
4040
username = System.getenv(DEFAULT_USERNAME_ENV_PRIVATE)
4141
password = System.getenv(DEFAULT_PASSWORD_ENV_PRIVATE)

0 commit comments

Comments
 (0)