Fix maven publish (#77)

* Fix maven publish * Fix magiclib-core publish --------- Signed-off-by: Hendrix-Shen <HendrixShen@hendrixshen.top>
Hendrix-Shen · Jun 13, 2024 · c41acab · c41acab
1 parent 16d035d
commit c41acab
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 12 deletions.
diff --git a/magiclib-core/build.gradle b/magiclib-core/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id("java")
-    id("java-library")
     id("maven-publish")
     id("signing")
 
@@ -10,7 +9,6 @@ plugins {
 
 allprojects {
     apply(plugin: "java")
-    apply(plugin: "java-library")
     apply(plugin: "maven-publish")
     apply(plugin: "signing")
 
@@ -130,15 +128,21 @@ subprojects {
         publications { PublicationContainer publications ->
             register("release", MavenPublication) { MavenPublication publication ->
                 artifactId("${project.parent.property("mod.artifact_name")}-${project.name}")
-                from(components.java as SoftwareComponent)
+                artifact(jar)
+                artifact(javadocJar)
+                artifact(sourcesJar)
+                artifact(shadowJar)
                 version("${project.getMavenArtifactVersion(this.project)}")
                 alias(false)
                 project.addPomMetadataInformation(this.project, publication)
             }
 
             register("snapshot", MavenPublication) { MavenPublication publication ->
                 artifactId("${project.parent.property("mod.artifact_name")}-${project.name}")
-                from(components.java as SoftwareComponent)
+                artifact(jar)
+                artifact(javadocJar)
+                artifact(sourcesJar)
+                artifact(shadowJar)
                 version("${project.property("mod.version")}-SNAPSHOT")
                 alias(true)
                 project.addPomMetadataInformation(this.project, publication)

diff --git a/magiclib-wrapper/fabric/build.gradle b/magiclib-wrapper/fabric/build.gradle
@@ -3,14 +3,12 @@ import groovy.json.JsonSlurper
 
 plugins {
     id("java")
-    id("java-library")
     id("maven-publish")
     id("signing")
 }
 
 allprojects {
     apply(plugin: "java")
-    apply(plugin: "java-library")
     apply(plugin: "maven-publish")
     apply(plugin: "signing")
 }
@@ -166,7 +164,9 @@ subprojects {
         publications { PublicationContainer publications ->
             register("release", MavenPublication) { MavenPublication publication ->
                 artifactId("${project.parent.property("mod.artifact_name")}-${project.name}-${project.parent.name}")
-                from(components.java as SoftwareComponent)
+                artifact(jar)
+                artifact(javadocJar)
+                artifact(sourcesJar)
                 version("${this.project.getMavenArtifactVersion(rootProject)}")
                 alias(false)
                 this.project.addPomMetadataInformation(this.project, publication)
@@ -176,10 +176,10 @@ subprojects {
                     Node core_dependency = dependencies.appendNode("dependency")
                     core_dependency.appendNode("groupId", coreProject.group)
                     core_dependency.appendNode("artifactId", "${coreProject.parent.property("mod.artifact_name")}-${coreProject.name}")
-                    core_dependency.appendNode("version", "${this.project.getMavenArtifactVersion(rootProject)}")
+                    core_dependency.appendNode("version", "${this.project.getMavenArtifactVersion(coreProject.parent)}")
                     core_dependency.appendNode("scope", "compile")
                     submodules
-                            .findAll { !it.name.contains("magiclib-legacy-compat") }
+                            .findAll { !it.name.contains("legacy") }
                             .forEach { Project submodule ->
                                 Node dependency = dependencies.appendNode("dependency")
                                 dependency.appendNode("groupId", submodule.group)
@@ -192,7 +192,9 @@ subprojects {
 
             register("snapshot", MavenPublication) { MavenPublication publication ->
                 artifactId("${project.parent.property("mod.artifact_name")}-${project.name}-${project.parent.name}")
-                from(components.java as SoftwareComponent)
+                artifact(jar)
+                artifact(javadocJar)
+                artifact(sourcesJar)
                 version("${project.property("mod.version")}-SNAPSHOT")
                 alias(true)
                 project.addPomMetadataInformation(this.project, publication)
@@ -202,10 +204,10 @@ subprojects {
                     Node core_dependency = dependencies.appendNode("dependency")
                     core_dependency.appendNode("groupId", coreProject.group)
                     core_dependency.appendNode("artifactId", "${coreProject.parent.property("mod.artifact_name")}-${coreProject.name}")
-                    core_dependency.appendNode("version", "${this.project.getMavenArtifactVersion(rootProject)}")
+                    core_dependency.appendNode("version", "${this.project.getMavenArtifactVersion(coreProject.parent)}")
                     core_dependency.appendNode("scope", "compile")
                     submodules
-                            .findAll { !it.name.contains("magiclib-legacy-compat") }
+                            .findAll { !it.name.contains("legacy") }
                             .forEach { Project submodule ->
                                 Node dependency = dependencies.appendNode("dependency")
                                 dependency.appendNode("groupId", submodule.group)

diff --git a/magiclib-wrapper/forge/build.gradle b/magiclib-wrapper/forge/build.gradle
@@ -239,6 +239,11 @@ subprojects {
 
                 pom.withXml { XmlProvider provider ->
                     Node dependencies = provider.asNode().appendNode("dependencies")
+                    Node core_dependency = dependencies.appendNode("dependency")
+                    core_dependency.appendNode("groupId", coreProject.group)
+                    core_dependency.appendNode("artifactId", "${coreProject.parent.property("mod.artifact_name")}-${coreProject.name}")
+                    core_dependency.appendNode("version", "${this.project.getMavenArtifactVersion(coreProject.parent)}")
+                    core_dependency.appendNode("scope", "compile")
                     submodules.forEach { Project submodule ->
                         Node dependency = dependencies.appendNode("dependency")
                         dependency.appendNode("groupId", submodule.group)
@@ -263,6 +268,11 @@ subprojects {
 
                 pom.withXml { XmlProvider provider ->
                     Node dependencies = provider.asNode().appendNode("dependencies")
+                    Node core_dependency = dependencies.appendNode("dependency")
+                    core_dependency.appendNode("groupId", coreProject.group)
+                    core_dependency.appendNode("artifactId", "${coreProject.parent.property("mod.artifact_name")}-${coreProject.name}")
+                    core_dependency.appendNode("version", "${this.project.getMavenArtifactVersion(coreProject.parent)}")
+                    core_dependency.appendNode("scope", "compile")
                     submodules.forEach { Project submodule ->
                         Node dependency = dependencies.appendNode("dependency")
                         dependency.appendNode("groupId", submodule.group)

diff --git a/magiclib-wrapper/neoforge/build.gradle b/magiclib-wrapper/neoforge/build.gradle
@@ -239,6 +239,11 @@ subprojects {
 
                 pom.withXml { XmlProvider provider ->
                     Node dependencies = provider.asNode().appendNode("dependencies")
+                    Node core_dependency = dependencies.appendNode("dependency")
+                    core_dependency.appendNode("groupId", coreProject.group)
+                    core_dependency.appendNode("artifactId", "${coreProject.parent.property("mod.artifact_name")}-${coreProject.name}")
+                    core_dependency.appendNode("version", "${this.project.getMavenArtifactVersion(coreProject.parent)}")
+                    core_dependency.appendNode("scope", "compile")
                     submodules.forEach { Project submodule ->
                         Node dependency = dependencies.appendNode("dependency")
                         dependency.appendNode("groupId", submodule.group)
@@ -263,6 +268,11 @@ subprojects {
 
                 pom.withXml { XmlProvider provider ->
                     Node dependencies = provider.asNode().appendNode("dependencies")
+                    Node core_dependency = dependencies.appendNode("dependency")
+                    core_dependency.appendNode("groupId", coreProject.group)
+                    core_dependency.appendNode("artifactId", "${coreProject.parent.property("mod.artifact_name")}-${coreProject.name}")
+                    core_dependency.appendNode("version", "${this.project.getMavenArtifactVersion(coreProject.parent)}")
+                    core_dependency.appendNode("scope", "compile")
                     submodules.forEach { Project submodule ->
                         Node dependency = dependencies.appendNode("dependency")
                         dependency.appendNode("groupId", submodule.group)