diff --git a/.gitignore b/.gitignore index 2039a20..22c1a50 100644 --- a/.gitignore +++ b/.gitignore @@ -45,4 +45,4 @@ out/ # Linux temp files *~ -!gradle/wrapper/gradle-wrapper.jar \ No newline at end of file +*.bat diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..9066098 --- /dev/null +++ b/Jenkinsfile @@ -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 + } + } + } +} diff --git a/api/build.gradle.kts b/api/build.gradle.kts index af6b2d8..61118f8 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } 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 { @@ -21,9 +21,12 @@ publishing { repositories{ maven { - name = "maven" - url = uri("https://repo.destro.xyz/snapshots") - credentials(PasswordCredentials::class) + name = "nexus" + url = uri("https://repo.alttd.com/repository/alttd-snapshot/") + credentials { + username = project.property("alttdDevPublishUser") as String + password = project.property("alttdDevPublishPass") as String + } } } -} \ No newline at end of file +} diff --git a/build.gradle.kts b/build.gradle.kts index f34b224..c55fd86 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,11 @@ plugins { id("java") - id("com.github.johnrengelman.shadow") version "7.1.0" id("maven-publish") } allprojects { group = "com.alttd.datalock" - version = "1.1.0-SNAPSHOT" + version = "1.2.0-SNAPSHOT" description = "Altitude DataLock Library." } @@ -16,7 +15,7 @@ subprojects { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(21)) } } } @@ -36,13 +35,16 @@ publishing { repositories{ maven { - name = "maven" - url = uri("https://repo.destro.xyz/snapshots") - credentials(PasswordCredentials::class) + name = "nexus" + url = uri("https://repo.alttd.com/repository/alttd-snapshot/") + credentials { + username = project.property("alttdDevPublishUser") as String + password = project.property("alttdDevPublishPass") as String + } } } } dependencies { - compileOnly("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..a80b22c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME 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 zipStorePath=wrapper/dists diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 2d9b821..c528010 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -4,14 +4,13 @@ import java.net.URL plugins { `maven-publish` - id("com.github.johnrengelman.shadow") id("net.minecrell.plugin-yml.bukkit") version "0.5.1" id("xyz.jpenilla.run-paper") version "1.0.6" } dependencies { 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 { @@ -20,41 +19,13 @@ tasks { 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 { name = rootProject.name main = "$group.${rootProject.name}" version = gitCommit() - apiVersion = "1.19" + apiVersion = "1.21" authors = listOf("Teriuihi") } @@ -74,4 +45,4 @@ fun download(link: String, path: File) { input.copyTo(output) } } -} \ No newline at end of file +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 878f597..db70fa3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,12 +1,18 @@ rootProject.name = "DataLockLib" +val nexusUser = providers.gradleProperty("alttdDevPublishUser").get() +val nexusPass = providers.gradleProperty("alttdDevPublishPass").get() + include(":api") include(":plugin") dependencyResolutionManagement { repositories { 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) }