Skip to content

Commit 2f5eefc

Browse files
committed
fix publishing artifact ids
1 parent 0e32a8c commit 2f5eefc

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

build.gradle

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,25 @@ def setUpLibrary(project) {
5858
}
5959

6060
def setUpModule(project, String... dependencies) {
61+
// normally modules have a 'root' and subprojects
62+
// for different mc version ranges
63+
// the Core API is the only exception to this
64+
def isCore = (project == project.project(':libraries:core'))
65+
6166
project.apply plugin: 'java-library'
6267
project.apply plugin: 'eclipse'
6368
project.apply plugin: 'idea'
6469
project.apply plugin: 'maven-publish'
6570
project.apply plugin: 'org.quiltmc.loom'
6671
project.apply plugin: 'ploceus'
6772

68-
project.archivesBaseName = "${rootProject.archives_base_name}-${project.parent.archives_base_name}"
69-
project.version = "${project.parent.version}+mc${project.min_mc_version}#${project.max_mc_version}"
73+
if (isCore) {
74+
project.archivesBaseName = "${rootProject.archives_base_name}-${project.archives_base_name}"
75+
project.version = "${project.version}"
76+
} else {
77+
project.archivesBaseName = "${rootProject.archives_base_name}-${project.parent.archives_base_name}"
78+
project.version = "${project.parent.version}+mc${project.min_mc_version}#${project.max_mc_version}"
79+
}
7080
project.group = "${rootProject.root_maven_group}.${rootProject.maven_group}"
7181

7282
def libraries = getLibraryDependencies(project, dependencies)
@@ -137,6 +147,10 @@ def setUpModule(project, String... dependencies) {
137147
project.publishing {
138148
publications {
139149
mavenJava(MavenPublication) {
150+
if (!isCore) {
151+
artifactId project.parent.name
152+
}
153+
140154
artifact(project.remapJar) {
141155
builtBy project.remapJar
142156
}

libraries/core/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
setUpModule(project)
2-
3-
archivesBaseName = "${rootProject.archives_base_name}-${project.archives_base_name}"
4-
version = "${project.version}"
5-
group = "${rootProject.maven_group}.${project.maven_group}"

0 commit comments

Comments
 (0)