Skip to content

Commit daa5223

Browse files
committed
[DEV] Fix Maven Publishing and Common Jar naming
1 parent 30ea00f commit daa5223

2 files changed

Lines changed: 10 additions & 15 deletions

File tree

build.gradle.kts

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,18 @@ multimined.setup {
3030
multiLoader = true
3131
version(orion.getProperty("minecraft_version"))
3232

33-
val commonShadow: MultiMinedExtension.LoaderConfiguration.ShadowJarConfig.() -> Unit = {
33+
val commonShadow: MultiMinedExtension.ShadowJarConfig.() -> Unit = {
3434
exclude("com.google.code.gson:.*")
3535
relocate("me.hypherionmc.moonconfig" to "shadow.hypherionmc.moonconfig")
3636
relocate("me.hypherionmc.mcdiscordformatter" to "shadow.hypherionmc.mcdiscordformatter")
3737
mergeServiceFiles()
3838
}
3939

40+
shadowJar {
41+
commonShadow()
42+
relocate("net.kyori" to "shadow.kyori")
43+
}
44+
4045
fabric {
4146
version(orion.getProperty("fabric_loader"))
4247

@@ -226,22 +231,12 @@ if (multimined.platformEnabled("forge")) {
226231
// endregion
227232

228233
// region Maven Publishing
229-
/*publishing {
230-
publications {
231-
create<MavenPublication>("maven") {
232-
artifactId = project.base.archivesName.get()
233-
from(components["java"])
234-
235-
artifact(tasks.named("remapFabricJar")) { builtBy(tasks.named("remapFabricJar")) }
236-
artifact(tasks.named("remapNeoforgeJar")) { builtBy(tasks.named("remapNeoforgeJar")) }
237-
artifact(tasks.named("remapForgeJar")) { builtBy(tasks.named("remapForgeJar")) }
238-
}
239-
}
240-
234+
publishing {
235+
// The rest of this is automatically configured by Orion
241236
repositories {
242237
maven {
243238
orion.getPublishingMaven()
244239
}
245240
}
246-
}*/
241+
}
247242
// endregion

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
unimined = "1.4.2-SNAPSHOT"
33
shadow = "9.2.2"
44
modpublisher = "2.1.8+snapshot.2"
5-
orion = "2.0.+"
5+
orion = "2.0.11"
66

77
[plugins]
88
unimined = { id = "xyz.wagyourtail.unimined", version.ref = "unimined" }

0 commit comments

Comments
 (0)