Skip to content

Commit a2d40f9

Browse files
committed
build: use ftb-publishing from mods-meta, version -> 2001.1.2
1 parent c0b6ac7 commit a2d40f9

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ allprojects {
3131
group = project.maven_group
3232
archivesBaseName = project.archives_base_name
3333

34+
// needs to be done AFTER version is set
35+
apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/publishing.gradle"
36+
3437
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = 17
3538

3639
compileJava {

fabric/build.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,29 +91,30 @@ if (ENV.CURSEFORGE_KEY) {
9191

9292
publishing {
9393
publications {
94-
mavenFabric(MavenPublication) {
94+
mavenForge(MavenPublication) {
9595
artifactId = "${rootProject.archives_base_name}-${project.name}"
96+
version ftbPublishing.mavenVersion
9697
from components.java
9798
}
9899
}
99100

100101
repositories {
101-
if (ENV.FTB_MAVEN_TOKEN) {
102+
if (ftbPublishing.ftbToken) {
102103
maven {
103-
url "https://maven.ftb.dev/release"
104+
url ftbPublishing.ftbURL
104105
credentials {
105-
username = "ftb"
106-
password = "${ENV.FTB_MAVEN_TOKEN}"
106+
username = ftbPublishing.ftbUser
107+
password = ftbPublishing.ftbToken
107108
}
108109
}
109110
}
110111

111-
if (ENV.SAPS_TOKEN) {
112+
if (ftbPublishing.sapsToken) {
112113
maven {
113-
url "https://maven.saps.dev/minecraft"
114+
url ftbPublishing.sapsURL
114115
credentials {
115-
username = "ftb"
116-
password = "${ENV.SAPS_TOKEN}"
116+
username = ftbPublishing.sapsUser
117+
password = ftbPublishing.sapsToken
117118
}
118119
}
119120
}

forge/build.gradle

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,27 +104,28 @@ publishing {
104104
publications {
105105
mavenForge(MavenPublication) {
106106
artifactId = "${rootProject.archives_base_name}-${project.name}"
107+
version ftbPublishing.mavenVersion
107108
from components.java
108109
}
109110
}
110111

111112
repositories {
112-
if (ENV.FTB_MAVEN_TOKEN) {
113+
if (ftbPublishing.ftbToken) {
113114
maven {
114-
url "https://maven.ftb.dev/release"
115+
url ftbPublishing.ftbURL
115116
credentials {
116-
username = "ftb"
117-
password = "${ENV.FTB_MAVEN_TOKEN}"
117+
username = ftbPublishing.ftbUser
118+
password = ftbPublishing.ftbToken
118119
}
119120
}
120121
}
121122

122-
if (ENV.SAPS_TOKEN) {
123+
if (ftbPublishing.sapsToken) {
123124
maven {
124-
url "https://maven.saps.dev/minecraft"
125+
url ftbPublishing.sapsURL
125126
credentials {
126-
username = "ftb"
127-
password = "${ENV.SAPS_TOKEN}"
127+
username = ftbPublishing.sapsUser
128+
password = ftbPublishing.sapsToken
128129
}
129130
}
130131
}

0 commit comments

Comments
 (0)