From 19852fbecd7510d162d8982a0a5c6024e067edf5 Mon Sep 17 00:00:00 2001 From: HypherionMC Date: Sat, 2 Dec 2023 15:46:59 +0200 Subject: [PATCH] [CHORE] Final preparations for release --- .jenkins/Jenkinsfile.deploy | 2 -- .jenkins/Jenkinsfile.snapshot | 6 +++--- Fabric/build.gradle | 7 ++----- Forge/build.gradle | 7 ++----- NeoForge/build.gradle | 4 ++-- build.gradle | 13 +------------ settings.gradle | 3 +-- 7 files changed, 11 insertions(+), 31 deletions(-) diff --git a/.jenkins/Jenkinsfile.deploy b/.jenkins/Jenkinsfile.deploy index 1d85884..98fe985 100644 --- a/.jenkins/Jenkinsfile.deploy +++ b/.jenkins/Jenkinsfile.deploy @@ -17,8 +17,6 @@ pipeline { } stage("Prepare") { steps { - sh "curl https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md --output changelog-forge.md" - sh "curl https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md --output changelog-fabric.md" sh "chmod +x ./gradlew" sh "./gradlew clean" } diff --git a/.jenkins/Jenkinsfile.snapshot b/.jenkins/Jenkinsfile.snapshot index c061de6..1644b6d 100644 --- a/.jenkins/Jenkinsfile.snapshot +++ b/.jenkins/Jenkinsfile.snapshot @@ -51,12 +51,12 @@ pipeline { projectSlug: "craterlib", projectName: "${projectName}", projectIcon: "${projectIcon}", - versionName: "Snapshot 3.0.${BUILD_NUMBER}", - version: "3.0.${BUILD_NUMBER}", + versionName: "Snapshot 1.0.${BUILD_NUMBER}", + version: "1.0.${BUILD_NUMBER}", modLoaders: "forge|neoforge|fabric|quilt", minecraftVersions: "1.20.2", failWebhook: env.SSS_WEBHOOK, - publishWebhooks: env.SSS_WEBHOOK + publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" deleteDir() } diff --git a/Fabric/build.gradle b/Fabric/build.gradle index b5f41fa..e79de25 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -113,7 +113,7 @@ publisher { curseID = curse_id modrinthID = modrinth_id versionType = "release" - changelog = rootProject.file("changelog-fabric.md") + changelog = "https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md" version = "${minecraft_version}-${project.version}" displayName = "[FABRIC/QUILT 1.20.2] CraterLib - ${project.version}" gameVersions = ["1.20.2"] @@ -127,7 +127,4 @@ publisher { curseDepends { required = ["fabric-api"] } -} - -publishCurseforge.dependsOn(remapJar) -publishModrinth.dependsOn(remapJar) \ No newline at end of file +} \ No newline at end of file diff --git a/Forge/build.gradle b/Forge/build.gradle index 4c3566a..eddb33e 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -107,13 +107,10 @@ publisher { curseID = curse_id modrinthID = modrinth_id versionType = "release" - changelog = rootProject.file("changelog-forge.md") + changelog = "https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md" version = "${minecraft_version}-${project.version}" displayName = "[FORGE 1.20.2] CraterLib - ${project.version}" gameVersions = ["1.20.2"] loaders = ["forge"] artifact = remapJar -} - -publishCurseforge.dependsOn(remapJar) -publishModrinth.dependsOn(remapJar) \ No newline at end of file +} \ No newline at end of file diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle index 341527b..e4f979a 100644 --- a/NeoForge/build.gradle +++ b/NeoForge/build.gradle @@ -98,7 +98,7 @@ publishing { } } -publisher { +/*publisher { apiKeys { modrinth = System.getenv("MODRINTH_TOKEN") curseforge = System.getenv("CURSE_TOKEN") @@ -116,4 +116,4 @@ publisher { } publishCurseforge.dependsOn(remapJar) -publishModrinth.dependsOn(remapJar) \ No newline at end of file +publishModrinth.dependsOn(remapJar)*/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 01a561b..0921fab 100644 --- a/build.gradle +++ b/build.gradle @@ -2,21 +2,10 @@ plugins { id 'java' id 'com.github.johnrengelman.shadow' version '8.0.0' apply false id "xyz.wagyourtail.unimined" version "1.1.0-SNAPSHOT" apply false - id "me.hypherionmc.modutils.modpublisher" version "1.0.+" + id "me.hypherionmc.modutils.modpublisher" version "1.0.23+" id 'maven-publish' - //id 'com.matyrobbrt.mc.registrationutils' version '1.20.1-1.0.0' } -// TODO Reg Utils -/*registrationUtils { - group 'com.hypherionmc.craterlib.core.systems.reg' - projects { - Common { type 'common'; project ':Common' } - Fabric { type 'fabric'; project ':Fabric' } - Forge { type 'forge'; project ':Forge' } - } -}*/ - ext { release=project.properties['release'] ?: false } diff --git a/settings.gradle b/settings.gradle index d9cb6b1..2988fbb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,5 +12,4 @@ pluginManagement { rootProject.name = 'CraterLib' include("Common", "Fabric", "Forge") -include 'NeoForge' - +include 'NeoForge' \ No newline at end of file