Skip to content

Commit 46fa9d7

Browse files
committed
chore: update to latest Minestom, fix central publishing
1 parent 6d15499 commit 46fa9d7

File tree

4 files changed

+18
-57
lines changed

4 files changed

+18
-57
lines changed

build.gradle.kts

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,52 @@ plugins {
33

44
`maven-publish`
55
signing
6-
alias(libs.plugins.nexuspublish)
6+
alias(libs.plugins.nmcp)
77
}
88

99
group = "dev.hollowcube"
1010
version = System.getenv("TAG_VERSION") ?: "dev"
1111
description = "Fast and small world format for Minestom"
1212

1313
repositories {
14-
mavenLocal()
1514
mavenCentral()
16-
maven(url = "https://jitpack.io")
1715
}
1816

1917
dependencies {
20-
val minestom = libs.minestom
21-
22-
compileOnly(minestom)
18+
compileOnly(libs.minestom)
2319
implementation(libs.zstd)
24-
// Fastutil is only included because minestom already uses it, otherwise it is a crazy dependency
25-
// for how it is used in this project.
20+
// Fastutil is only included because minestom already uses it,
21+
// otherwise it is a crazy dependency for how it is used in this project.
2622
implementation(libs.fastutil)
2723

2824
testImplementation("ch.qos.logback:logback-core:1.4.7")
2925
testImplementation("ch.qos.logback:logback-classic:1.4.7")
3026

3127
testImplementation(platform("org.junit:junit-bom:5.9.1"))
3228
testImplementation("org.junit.jupiter:junit-jupiter")
33-
testImplementation(minestom)
29+
testImplementation(libs.minestom)
3430
}
3531

3632
java {
3733
withSourcesJar()
3834
withJavadocJar()
3935

40-
sourceCompatibility = JavaVersion.VERSION_21
41-
targetCompatibility = JavaVersion.VERSION_21
36+
toolchain.languageVersion = JavaLanguageVersion.of(21)
4237
}
4338

4439
tasks.test {
4540
maxHeapSize = "2g"
4641
useJUnitPlatform()
4742
}
4843

49-
nexusPublishing {
50-
this.packageGroup.set("dev.hollowcube")
51-
52-
repositories.sonatype {
53-
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
54-
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
55-
56-
if (System.getenv("SONATYPE_USERNAME") != null) {
57-
username.set(System.getenv("SONATYPE_USERNAME"))
58-
password.set(System.getenv("SONATYPE_PASSWORD"))
59-
}
44+
nmcpAggregation {
45+
centralPortal {
46+
username = System.getenv("SONATYPE_USERNAME")
47+
password = System.getenv("SONATYPE_PASSWORD")
48+
publishingType = if ("dev" in project.version.toString()) "USER_MANAGED" else "AUTOMATIC"
6049
}
50+
51+
publishAllProjectsProbablyBreakingProjectIsolation()
6152
}
6253

6354
publishing.publications.create<MavenPublication>("maven") {

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
metadata.format.version = "1.1"
22

33
[versions]
4-
minestom = "1_21_5-1c8431a9ec"
4+
minestom = "2025.07.03-1.21.5"
55
zstd = "1.5.5-3"
66
fastutil = "8.5.12"
77

8-
nexuspublish = "1.3.0"
8+
nmcp = "1.0.0-rc.1"
99

1010
[libraries]
11-
minestom = { group = "net.minestom", name = "minestom-snapshots", version.ref = "minestom" }
11+
minestom = { group = "net.minestom", name = "minestom", version.ref = "minestom" }
1212
zstd = { group = "com.github.luben", name = "zstd-jni", version.ref = "zstd" }
1313
fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" }
1414

1515
[plugins]
16-
nexuspublish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexuspublish" }
16+
nmcp = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sat May 27 21:36:08 EDT 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

src/main/java/net/minestom/server/instance/palette/PolarPaletteAccessWidener.java

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

0 commit comments

Comments
 (0)