Update to 26.2

This commit is contained in:
Len 2026-07-30 08:20:03 -05:00
parent 20797bd128
commit 5202301fdb
2 changed files with 18 additions and 17 deletions

View File

@ -35,7 +35,7 @@ tasks {
file.parentFile.mkdirs() file.parentFile.mkdirs()
} }
if (!file.exists()) { if (!file.exists()) {
download("https://jenkins.destro.xyz/job/Cosmos/lastSuccessfulBuild/artifact/cosmos-server/build/libs/cosmos-bundler-1.21.11-R0.1-SNAPSHOT-mojmap.jar", fileName) // download("https://jenkins.destro.xyz/job/Cosmos/lastSuccessfulBuild/artifact/cosmos-server/build/libs/cosmos-bundler-1.21.11-R0.1-SNAPSHOT-mojmap.jar", fileName)
} }
serverJar(file) serverJar(file)
minecraftVersion("1.21") minecraftVersion("1.21")
@ -67,7 +67,7 @@ publishing {
} }
dependencies { dependencies {
compileOnly("com.alttd.cosmos:cosmos-api:1.21.11-R0.1-SNAPSHOT") compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable")
compileOnly("com.github.milkbowl:VaultAPI:1.7") { compileOnly("com.github.milkbowl:VaultAPI:1.7") {
exclude("org.bukkit","bukkit") exclude("org.bukkit","bukkit")
} }
@ -77,15 +77,6 @@ dependencies {
annotationProcessor("org.projectlombok:lombok:1.18.30") annotationProcessor("org.projectlombok:lombok:1.18.30")
} }
fun gitCommit(): String {
val os = ByteArrayOutputStream()
project.exec {
commandLine = "git rev-parse --short HEAD".split(" ")
standardOutput = os
}
return String(os.toByteArray()).trim()
}
fun download(link: String, path: String) { fun download(link: String, path: String) {
URL(link).openStream().use { input -> URL(link).openStream().use { input ->
FileOutputStream(File(path)).use { output -> FileOutputStream(File(path)).use { output ->
@ -98,7 +89,7 @@ paper {
name = rootProject.name name = rootProject.name
main = "$group.${rootProject.name}" main = "$group.${rootProject.name}"
bootstrapper = "$group.${rootProject.name}Bootstrap" bootstrapper = "$group.${rootProject.name}Bootstrap"
version = "${rootProject.version}-${gitCommit()}" version = "${rootProject.version}"
apiVersion = "1.21" apiVersion = "1.21"
authors = listOf("destro174") authors = listOf("destro174")
serverDependencies { serverDependencies {

View File

@ -1,14 +1,24 @@
rootProject.name = "PlayerShops" rootProject.name = "PlayerShops"
val nexusUser = providers.gradleProperty("alttdSnapshotUsername").orNull ?: System.getenv("NEXUS_USERNAME")
val nexusPass = providers.gradleProperty("alttdSnapshotPassword").orNull ?: System.getenv("NEXUS_PASSWORD")
dependencyResolutionManagement { dependencyResolutionManagement {
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven {
name = "AlttdNexus" url = uri("https://repo.alttd.com/repository/alttd-snapshot/")
url = uri( credentials {
"https://repo.alttd.com/repository/alttd-snapshot/" username = nexusUser
) password = nexusPass
credentials(PasswordCredentials::class) }
}
maven {
url = uri("https://repo.alttd.com/repository/alttd/")
credentials {
username = nexusUser
password = nexusPass
}
} }
maven("https://repo.destro.xyz/snapshots") maven("https://repo.destro.xyz/snapshots")
maven("https://jitpack.io") { // Vault maven("https://jitpack.io") { // Vault