Sfoglia il codice sorgente

Fix maven not declaring basic-math as a dependency.

Signed-off-by: shedaniel <daniel@shedaniel.me>
shedaniel 4 anni fa
parent
commit
e88aa5edcf
3 ha cambiato i file con 11 aggiunte e 14 eliminazioni
  1. 6 13
      common/build.gradle
  2. 2 0
      fabric/build.gradle
  3. 3 1
      forge/build.gradle

+ 6 - 13
common/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "5.0.0"
+    id "maven-publish"
 }
 
 loom {
@@ -38,16 +39,6 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     from sourceSets.main.allSource
 }
 
-task javadocs(type: Javadoc) {
-    source = sourceSets.main.allJava
-}
-
-task javadocsJar(type: Jar, dependsOn: javadocs) {
-    archiveClassifier.set("javadocs")
-    javadocs.failOnError false
-    from javadocs.destinationDir
-}
-
 shadowJar {
     relocate "blue.endless.jankson", "${rootProject.maven_group}.clothconfig.shadowed.blue.endless.jankson"
     relocate "com.moandjiezana.toml", "${rootProject.maven_group}.clothconfig.shadowed.com.moandjiezana.toml"
@@ -64,14 +55,16 @@ build {
 publishing {
     publications {
         mavenCommon(MavenPublication) {
-            artifact(shadowJar)
+            artifactId = rootProject.archives_base_name
+            artifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}.jar")) {
+                builtBy shadowJar
+            }
             artifact(sourcesJar) {
                 builtBy remapSourcesJar
             }
-            artifact javadocsJar
         }
     }
-    
+
     repositories {
         if (System.getenv("MAVEN_PASS") != null) {
             maven {

+ 2 - 0
fabric/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "5.0.0"
     id "com.matthewprenger.cursegradle"
+    id "maven-publish"
 }
 
 loom {
@@ -88,6 +89,7 @@ remapJar {
 publishing {
     publications {
         mavenFabric(MavenPublication) {
+            artifactId = rootProject.archives_base_name
             artifact(remapJar.archivePath) {
                 builtBy build
                 classifier "fabric"

+ 3 - 1
forge/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "5.0.0"
     id "com.matthewprenger.cursegradle"
+    id "maven-publish"
 }
 
 configurations {
@@ -22,7 +23,7 @@ dependencies {
 
     forge "net.minecraftforge:forge:${rootProject.architectury.minecraft}-${rootProject.forge_version}"
 
-    compile("me.shedaniel.cloth:basic-math:0.5.1")
+    modApi("me.shedaniel.cloth:basic-math:0.5.1")
     shadow("me.shedaniel.cloth:basic-math:0.5.1")
 
     implementation("blue.endless:jankson:${rootProject.jankson_version}")
@@ -75,6 +76,7 @@ remapJar {
 publishing {
     publications {
         mavenForge(MavenPublication) {
+            artifactId = rootProject.archives_base_name
             artifact(remapJar.archivePath) {
                 builtBy build
                 classifier "forge"