From 8d353df33d9f6aa6dfacc3bef1d96cac9fe63d93 Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Wed, 4 Oct 2023 08:17:09 +0100 Subject: [PATCH] build: bring maven publishing up to date --- build.gradle | 3 +++ common/build.gradle | 16 ++++++++-------- fabric/build.gradle | 16 ++++++++-------- forge/build.gradle | 16 ++++++++-------- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index dbe01cc..21a3e42 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,9 @@ allprojects { group = project.maven_group archivesBaseName = project.archives_base_name + // needs to be done AFTER version is set + apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/publishing.gradle" + sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = 17 compileJava { diff --git a/common/build.gradle b/common/build.gradle index 78db14b..93d5b25 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -21,22 +21,22 @@ publishing { } repositories { - if (ENV.FTB_MAVEN_TOKEN) { + if (ftbPublishing.ftbToken) { maven { - url "https://maven.ftb.dev/release" + url ftbPublishing.ftbURL credentials { - username = "ftb" - password = "${ENV.FTB_MAVEN_TOKEN}" + username = ftbPublishing.ftbUser + password = ftbPublishing.ftbToken } } } - if (ENV.SAPS_TOKEN) { + if (ftbPublishing.sapsToken) { maven { - url "https://maven.saps.dev/minecraft" + url ftbPublishing.sapsURL credentials { - username = "ftb" - password = "${ENV.SAPS_TOKEN}" + username = ftbPublishing.sapsUser + password = ftbPublishing.sapsToken } } } diff --git a/fabric/build.gradle b/fabric/build.gradle index efbbf54..7e2418d 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -95,22 +95,22 @@ publishing { } repositories { - if (ENV.FTB_MAVEN_TOKEN) { + if (ftbPublishing.ftbToken) { maven { - url "https://maven.ftb.dev/release" + url ftbPublishing.ftbURL credentials { - username = "ftb" - password = "${ENV.FTB_MAVEN_TOKEN}" + username = ftbPublishing.ftbUser + password = ftbPublishing.ftbToken } } } - if (ENV.SAPS_TOKEN) { + if (ftbPublishing.sapsToken) { maven { - url "https://maven.saps.dev/minecraft" + url ftbPublishing.sapsURL credentials { - username = "ftb" - password = "${ENV.SAPS_TOKEN}" + username = ftbPublishing.sapsUser + password = ftbPublishing.sapsToken } } } diff --git a/forge/build.gradle b/forge/build.gradle index 463021c..aa4060c 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -115,22 +115,22 @@ publishing { } repositories { - if (ENV.FTB_MAVEN_TOKEN) { + if (ftbPublishing.ftbToken) { maven { - url "https://maven.ftb.dev/release" + url ftbPublishing.ftbURL credentials { - username = "ftb" - password = "${ENV.FTB_MAVEN_TOKEN}" + username = ftbPublishing.ftbUser + password = ftbPublishing.ftbToken } } } - if (ENV.SAPS_TOKEN) { + if (ftbPublishing.sapsToken) { maven { - url "https://maven.saps.dev/minecraft" + url ftbPublishing.sapsURL credentials { - username = "ftb" - password = "${ENV.SAPS_TOKEN}" + username = ftbPublishing.sapsUser + password = ftbPublishing.sapsToken } } }