From 5210abf70f755c309434fa05e7d987338424454b Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Sun, 13 Jun 2021 21:02:33 +0200 Subject: [PATCH] update build.gradle --- build.gradle | 115 +++++++++++++++++++++++++++++++++++++++++++- fabric/build.gradle | 79 ++---------------------------- forge/build.gradle | 82 ++----------------------------- settings.gradle | 8 ++- 4 files changed, 129 insertions(+), 155 deletions(-) diff --git a/build.gradle b/build.gradle index 0a40e96..4ac0d9b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,19 @@ +buildscript { + dependencies { + classpath group: 'com.diluv.schoomp', name: 'Schoomp', version: '1.1.0' + } +} + plugins { id "architectury-plugin" version "3.1-SNAPSHOT" id "dev.architectury.loom" version "0.7.2-SNAPSHOT" apply false + id 'com.matthewprenger.cursegradle' version '1.4.0' } +import com.diluv.schoomp.Webhook +import com.diluv.schoomp.message.Message +import com.diluv.schoomp.message.embed.Embed + architectury { minecraft = rootProject.minecraft_version } @@ -42,6 +53,22 @@ allprojects { } } +task buildAll { + dependsOn(":fabric:build") + dependsOn(":forge:build") +} + +task cleanAll { + dependsOn(":common:clean") + dependsOn(":fabric:clean") + dependsOn(":forge:clean") +} + +task publishAll { + dependsOn(":fabric:publish") + dependsOn(":forge:publish") +} + def changelog(int versions) { try { def changelog = "" @@ -79,4 +106,90 @@ def discordChangelog() { } res.add(temp) return res -} \ No newline at end of file +} + +curseforge { + apiKey = findProperty('curseApiToken') ?: 0 + + project { + id = "${curse_id_fabric}" + "${project.curse_versions}".split(', ').each { + addGameVersion "${it}" + } + addGameVersion "Fabric" + mainArtifact("${project.getProjectDir()}fabric/build/libs/${project.archives_base_name}-${project.minecraft_version}-${project.mod_version}-fabric.jar") { + def txt = changelog(1).replace("\n-", "\n\n- ") + txt = txt + "\n\n" + "For past versions see: https://github.com/Flemmli97/Flan/blob/1.16/Changelog.txt" + changelog = txt + changelogType = "markdown" + releaseType = 'release' + } + relations { + "${project.curse_dep_fabric}".split(', ').each { + requiredDependency "${it}" + } + } + } + project { + id = "${curse_id_forge}" + "${project.curse_versions}".split(', ').each { + addGameVersion "${it}" + } + addGameVersion "Forge" + mainArtifact("${project.getProjectDir()}fabric/build/libs/${project.archives_base_name}-${project.minecraft_version}-${project.mod_version}-forge.jar") { + def txt = changelog(1).replace("\n-", "\n\n- ") + txt = txt + "\n\n" + "For past versions see: https://github.com/Flemmli97/Flan/blob/1.16/Changelog.txt" + changelog = txt + changelogType = "markdown" + releaseType = 'release' + } + /*relations { + "${project.curse_dep_forge}".split(', ').each { + requiredDependency "${it}" + } + }*/ + } +} + +tasks.getByName("curseforge").doLast { + try { + def fileIDFabric = tasks.getByName("curseforge${project.curse_id_fabric}").property('mainArtifact').fileID + def fileIDForge = tasks.getByName("curseforge${project.curse_id_forge}").property('mainArtifact').fileID + + def webhook = new Webhook(findProperty('discordHook'), "${project.project_name} Upload") + + def message = new Message() + def version = project.curse_versions.split(', ')[0] + message.setUsername("Curseforge Release") + message.setContent("<@&852113509243682817> ${project.project_name} ${project.mod_version} for Minecraft ${version} has been released!") + message.setAvatarUrl("https://cdn.discordapp.com/avatars/680540027255652407/e4b7a058b24843ae13389a9a3cc3ae8c.png?size=128") + + def embed = new Embed() + embed.addField('Get the fabric version here (When it is accepted)', "${project.findProperty('curse_page_fabric')}/files/${fileIDFabric}", false) + embed.addField('Get the forge version here (When it is accepted)', "${project.findProperty('curse_page_forge')}/files/${fileIDForge}", false) + def changelog = discordChangelog() + if (changelog.size() == 1) + embed.addField('Change Log', "```md\n${changelog.get(0) ?: 'Unavailable :('}```", false) + else + changelog.forEach { + embed.addField("Change Log", "```md\n${it}```", false) + } + embed.setColor(0xFF8000) + message.addEmbed(embed) + + webhook.sendMessage(message) + } + + catch (IOException e) { + println 'Failed to push to the Discord webhook.' + } +} + +task buildUploadAll(group: "publishing") { + dependsOn cleanAll, buildAll, publishAll//, tasks.getByName("curseforge") + buildAll.mustRunAfter cleanAll + tasks.findByName("curseforge").mustRunAfter publishAll +} + +tasks.getByName("curseforge").dependsOn buildAll +publishAll.dependsOn buildAll \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle index 10fc287..f97fbc9 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -5,14 +5,9 @@ buildscript { } plugins { - id 'com.matthewprenger.cursegradle' version '1.4.0' id "com.github.johnrengelman.shadow" version "5.0.0" } -import com.diluv.schoomp.Webhook -import com.diluv.schoomp.message.Message -import com.diluv.schoomp.message.embed.Embed - configurations { shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. } @@ -107,12 +102,13 @@ publishing { builtBy remapSourcesJar } artifactId project.archives_base_name - version project.version + version project.version + "-fabric" } } repositories { - maven { + mavenLocal() + /*maven { url "https://gitlab.com/api/v4/projects/21830712/packages/maven" //url "https://maven.pkg.github.com/flemmli97/<>" credentials { @@ -120,71 +116,6 @@ publishing { password = project.findProperty("gpr.gitlab.token") ?: System.getenv("GPR_GITLAB_TOKEN") //password = project.findProperty("gpr.github.token") ?: System.getenv("GPR_TOKEN") } - } + }*/ } -} - -curseforge { - apiKey = findProperty('curseApiToken') ?: 0 - - project { - id = "${curse_id_fabric}" - "${project.curse_versions}".split(', ').each { - addGameVersion "${it}" - } - addGameVersion "Fabric" - mainArtifact(remapJar) { - def txt = changelog(1).replace("\n-", "\n\n- ") - txt = txt + "\n\n" + "For past versions see: https://github.com/Flemmli97/Flan/blob/1.16/Changelog.txt" - changelog = txt - changelogType = "markdown" - releaseType = 'release' - } - relations { - "${project.curse_dep_fabric}".split(', ').each { - requiredDependency "${it}" - } - } - } -} - -tasks.getByName("curseforge").doLast { - try { - def fileID = tasks.getByName("curseforge${project.curse_id_fabric}").property('mainArtifact').fileID - - def webhook = new Webhook(findProperty('discordHook'), "${project.project_name} Upload") - - def message = new Message() - def version = project.curse_versions.split(', ')[0] - message.setUsername("Curseforge Release") - message.setContent("<@&852113509243682817> ${project.project_name} ${project.mod_version} for Minecraft ${version} has been released!") - message.setAvatarUrl("https://cdn.discordapp.com/avatars/680540027255652407/e4b7a058b24843ae13389a9a3cc3ae8c.png?size=128") - - def embed = new Embed() - embed.addField('Get it here (When it is accepted)', "${project.findProperty('curse_page_fabric')}/files/${fileID}", false) - def changelog = discordChangelog() - if (changelog.size() == 1) - embed.addField('Change Log', "```md\n${changelog.get(0) ?: 'Unavailable :('}```", false) - else - changelog.forEach { - embed.addField("Change Log", "```md\n${it}```", false) - } - embed.setColor(0xFF8000) - message.addEmbed(embed) - - webhook.sendMessage(message) - } - - catch (IOException e) { - println 'Failed to push to the Discord webhook.' - } -} - -task buildUploadAll(group: "publishing") { - dependsOn clean, build, publish, tasks.getByName("curseforge") - build.mustRunAfter clean - tasks.findByName("curseforge").mustRunAfter publish -} - -tasks.getByName("curseforge").dependsOn build -publish.dependsOn build +} \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle index ddea426..422dde0 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -1,18 +1,7 @@ -buildscript { - dependencies { - classpath group: 'com.diluv.schoomp', name: 'Schoomp', version: '1.1.0' - } -} - plugins { - id 'com.matthewprenger.cursegradle' version '1.4.0' id "com.github.johnrengelman.shadow" version "5.0.0" } -import com.diluv.schoomp.Webhook -import com.diluv.schoomp.message.Message -import com.diluv.schoomp.message.embed.Embed - configurations { shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. } @@ -87,12 +76,13 @@ publishing { builtBy remapSourcesJar } artifactId project.archives_base_name - version project.version + version project.version + "-forge" } } repositories { - maven { + mavenLocal() + /*maven { url "https://gitlab.com/api/v4/projects/21830712/packages/maven" //url "https://maven.pkg.github.com/flemmli97/<>" credentials { @@ -100,72 +90,6 @@ publishing { password = project.findProperty("gpr.gitlab.token") ?: System.getenv("GPR_GITLAB_TOKEN") //password = project.findProperty("gpr.github.token") ?: System.getenv("GPR_TOKEN") } - } - } -} - -curseforge { - apiKey = findProperty('curseApiToken') ?: 0 - - project { - id = "${curse_id_forge}" - "${project.curse_versions}".split(', ').each { - addGameVersion "${it}" - } - addGameVersion "Forge" - mainArtifact(remapJar) { - def txt = changelog(1).replace("\n-", "\n\n- ") - txt = txt + "\n\n" + "For past versions see: https://github.com/Flemmli97/Flan/blob/1.16/Changelog.txt" - changelog = txt - changelogType = "markdown" - releaseType = 'release' - } - /*relations { - "${project.curse_dep_forge}".split(', ').each { - requiredDependency "${it}" - } }*/ } } - -tasks.getByName("curseforge").doLast { - try { - def fileID = tasks.getByName("curseforge${project.curse_id_forge}").property('mainArtifact').fileID - - def webhook = new Webhook(findProperty('discordHook'), "${project.project_name} Upload") - - def message = new Message() - def version = project.curse_versions.split(', ')[0] - message.setUsername("Curseforge Release") - message.setContent("<@&852113509243682817> ${project.project_name} (Forge) ${project.mod_version} for Minecraft ${version} has been released!") - message.setAvatarUrl("https://cdn.discordapp.com/avatars/680540027255652407/e4b7a058b24843ae13389a9a3cc3ae8c.png?size=128") - - def embed = new Embed() - embed.addField('Get it here (When it is accepted)', "${project.findProperty('curse_page_forge')}/files/${fileID}", false) - def changelog = discordChangelog() - if (changelog.size() == 1) - embed.addField('Change Log', "```md\n${changelog.get(0) ?: 'Unavailable :('}```", false) - else - changelog.forEach { - embed.addField("Change Log", "```md\n${it}```", false) - } - embed.setColor(0xFF8000) - message.addEmbed(embed) - - webhook.sendMessage(message) - } - - catch (IOException e) { - println 'Failed to push to the Discord webhook.' - } -} - -task buildUploadAll(group: "publishing") { - dependsOn clean, build, publish, tasks.getByName("curseforge") - build.mustRunAfter clean - tasks.findByName("curseforge").mustRunAfter publish -} - -tasks.getByName("curseforge").dependsOn build -publish.dependsOn build - diff --git a/settings.gradle b/settings.gradle index 2e66780..837b0ed 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,13 @@ pluginManagement { url = 'https://maven.fabricmc.net/' } maven { url "https://maven.architectury.dev/" } - maven { url "https://maven.minecraftforge.net/" } + maven { url "https://repo1.maven.org/maven2/" } + maven { + url = 'https://maven.minecraftforge.net/' + content { + excludeGroupByRegex "org.eclipse.*" + } + } gradlePluginPortal() } }