Update to 1.21.6 using cosmos
This commit is contained in:
parent
f9c4ff1b1c
commit
5ced572237
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -45,4 +45,4 @@ out/
|
||||||
# Linux temp files
|
# Linux temp files
|
||||||
*~
|
*~
|
||||||
|
|
||||||
!gradle/wrapper/gradle-wrapper.jar
|
*.bat
|
||||||
|
|
|
||||||
41
Jenkinsfile
vendored
Normal file
41
Jenkinsfile
vendored
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
stages {
|
||||||
|
stage('Gradle') {
|
||||||
|
steps {
|
||||||
|
withCredentials([usernamePassword(credentialsId: 'alttd-publish-user', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
|
||||||
|
sh '''
|
||||||
|
chmod +x gradlew
|
||||||
|
./gradlew build -PalttdDevPublishUser=$USERNAME -PalttdDevPublishPass=$PASSWORD
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Publish to Maven') {
|
||||||
|
steps {
|
||||||
|
withCredentials([usernamePassword(credentialsId: 'alttd-publish-user', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
|
||||||
|
sh '''
|
||||||
|
chmod +x gradlew
|
||||||
|
./gradlew publish -PalttdDevPublishUser=$USERNAME -PalttdDevPublishPass=$PASSWORD
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Archive') {
|
||||||
|
steps {
|
||||||
|
archiveArtifacts artifacts: 'build/libs/', followSymlinks: false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('discord') {
|
||||||
|
when {
|
||||||
|
anyOf {
|
||||||
|
branch 'main'
|
||||||
|
branch 'master'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
steps {
|
||||||
|
discordSend description: "Build: ${BUILD_NUMBER}", showChangeset: true, result: currentBuild.currentResult, title: currentBuild.fullProjectName, webhookURL: env.discordwebhook
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -3,7 +3,7 @@ plugins {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT")
|
compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
|
|
@ -21,9 +21,12 @@ publishing {
|
||||||
|
|
||||||
repositories{
|
repositories{
|
||||||
maven {
|
maven {
|
||||||
name = "maven"
|
name = "nexus"
|
||||||
url = uri("https://repo.destro.xyz/snapshots")
|
url = uri("https://repo.alttd.com/repository/alttd-snapshot/")
|
||||||
credentials(PasswordCredentials::class)
|
credentials {
|
||||||
|
username = project.property("alttdDevPublishUser") as String
|
||||||
|
password = project.property("alttdDevPublishPass") as String
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("java")
|
id("java")
|
||||||
id("com.github.johnrengelman.shadow") version "7.1.0"
|
|
||||||
id("maven-publish")
|
id("maven-publish")
|
||||||
}
|
}
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
group = "com.alttd.datalock"
|
group = "com.alttd.datalock"
|
||||||
version = "1.1.0-SNAPSHOT"
|
version = "1.2.0-SNAPSHOT"
|
||||||
description = "Altitude DataLock Library."
|
description = "Altitude DataLock Library."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -16,7 +15,7 @@ subprojects {
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain {
|
toolchain {
|
||||||
languageVersion.set(JavaLanguageVersion.of(17))
|
languageVersion.set(JavaLanguageVersion.of(21))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -36,13 +35,16 @@ publishing {
|
||||||
|
|
||||||
repositories{
|
repositories{
|
||||||
maven {
|
maven {
|
||||||
name = "maven"
|
name = "nexus"
|
||||||
url = uri("https://repo.destro.xyz/snapshots")
|
url = uri("https://repo.alttd.com/repository/alttd-snapshot/")
|
||||||
credentials(PasswordCredentials::class)
|
credentials {
|
||||||
|
username = project.property("alttdDevPublishUser") as String
|
||||||
|
password = project.property("alttdDevPublishPass") as String
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT")
|
compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,5 +1,7 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
||||||
|
|
@ -4,14 +4,13 @@ import java.net.URL
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
`maven-publish`
|
`maven-publish`
|
||||||
id("com.github.johnrengelman.shadow")
|
|
||||||
id("net.minecrell.plugin-yml.bukkit") version "0.5.1"
|
id("net.minecrell.plugin-yml.bukkit") version "0.5.1"
|
||||||
id("xyz.jpenilla.run-paper") version "1.0.6"
|
id("xyz.jpenilla.run-paper") version "1.0.6"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(project(":api")) // API
|
implementation(project(":api")) // API
|
||||||
compileOnly("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT") // Galaxy
|
compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
|
|
@ -20,41 +19,13 @@ tasks {
|
||||||
enabled = true
|
enabled = true
|
||||||
}
|
}
|
||||||
|
|
||||||
shadowJar {
|
|
||||||
archiveFileName.set("${rootProject.name}.jar")
|
|
||||||
}
|
|
||||||
|
|
||||||
build {
|
|
||||||
dependsOn(shadowJar)
|
|
||||||
}
|
|
||||||
|
|
||||||
runServer {
|
|
||||||
val dir = File(System.getProperty("user.home") + "/share/devserver/")
|
|
||||||
if (!dir.parentFile.exists()) {
|
|
||||||
dir.parentFile.mkdirs()
|
|
||||||
}
|
|
||||||
runDirectory.set(dir)
|
|
||||||
|
|
||||||
val fileName = "/galaxy.jar"
|
|
||||||
val file = File(dir.path + fileName)
|
|
||||||
|
|
||||||
if (!file.parentFile.exists()) {
|
|
||||||
file.parentFile.mkdirs()
|
|
||||||
}
|
|
||||||
if (!file.exists()) {
|
|
||||||
download("https://repo.destro.xyz/snapshots/com/alttd/Galaxy-Server/Galaxy-paperclip-1.19.2-R0.1-SNAPSHOT-reobf.jar", file)
|
|
||||||
}
|
|
||||||
serverJar(file)
|
|
||||||
minecraftVersion("1.19.2")
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bukkit {
|
bukkit {
|
||||||
name = rootProject.name
|
name = rootProject.name
|
||||||
main = "$group.${rootProject.name}"
|
main = "$group.${rootProject.name}"
|
||||||
version = gitCommit()
|
version = gitCommit()
|
||||||
apiVersion = "1.19"
|
apiVersion = "1.21"
|
||||||
authors = listOf("Teriuihi")
|
authors = listOf("Teriuihi")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -74,4 +45,4 @@ fun download(link: String, path: File) {
|
||||||
input.copyTo(output)
|
input.copyTo(output)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,18 @@
|
||||||
rootProject.name = "DataLockLib"
|
rootProject.name = "DataLockLib"
|
||||||
|
|
||||||
|
val nexusUser = providers.gradleProperty("alttdDevPublishUser").get()
|
||||||
|
val nexusPass = providers.gradleProperty("alttdDevPublishPass").get()
|
||||||
|
|
||||||
include(":api")
|
include(":api")
|
||||||
include(":plugin")
|
include(":plugin")
|
||||||
|
|
||||||
dependencyResolutionManagement {
|
dependencyResolutionManagement {
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy
|
maven {
|
||||||
|
name = "papermc"
|
||||||
|
url = uri("https://repo.papermc.io/repository/maven-public/")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user