Merge pull request #3 from Mastriel/main

Jitpack Fix Hopefully
Outspending · Dec 28, 2023 · 2c373de · 2c373de
2 parents 9b34e00 + bfaae9f
commit 2c373de
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 39 deletions.
diff --git a/BiomesAPI-1.19_R2/build.gradle b/BiomesAPI-1.19_R2/build.gradle
@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
     paperweight.paperDevBundle('1.19.3-R0.1-SNAPSHOT')
-    implementation project(':BiomesAPI-NMS')
+    compileOnly project(':BiomesAPI-NMS')
 }
diff --git a/BiomesAPI-1.19_R3/build.gradle b/BiomesAPI-1.19_R3/build.gradle
@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
     paperweight.paperDevBundle('1.19.4-R0.1-SNAPSHOT')
-    implementation project(':BiomesAPI-NMS')
+    compileOnly project(':BiomesAPI-NMS')
 }
diff --git a/BiomesAPI-1.20_R1/build.gradle b/BiomesAPI-1.20_R1/build.gradle
@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
     paperweight.paperDevBundle('1.20-R0.1-SNAPSHOT')
-    implementation project(':BiomesAPI-NMS')
+    compileOnly project(':BiomesAPI-NMS')
 }
diff --git a/BiomesAPI-1.20_R2/build.gradle b/BiomesAPI-1.20_R2/build.gradle
@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
     paperweight.paperDevBundle('1.20.2-R0.1-SNAPSHOT')
-    implementation project(':BiomesAPI-NMS')
+    compileOnly project(':BiomesAPI-NMS')
 }
diff --git a/BiomesAPI-1.20_R3/build.gradle b/BiomesAPI-1.20_R3/build.gradle
@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
     paperweight.paperDevBundle('1.20.3-R0.1-SNAPSHOT')
-    implementation project(':BiomesAPI-NMS')
+    compileOnly project(':BiomesAPI-NMS')
 }
diff --git a/build.gradle b/build.gradle
@@ -6,6 +6,7 @@ plugins {
 allprojects {
     apply plugin: 'java'
     apply plugin: 'maven-publish'
+    apply plugin: 'com.github.johnrengelman.shadow'
 
     group = 'com.github.Outspending'
     version = '0.0.1'
@@ -17,38 +18,6 @@ allprojects {
         options.encoding = 'UTF-8'
     }
 
-    // The file for publication.
-    def buildFile = layout.buildDirectory.file("libs/BiomesAPI-${project.version}.jar")
-
-    publishing {
-        publications {
-            create('maven', MavenPublication) {
-                groupId = it.groupId
-                artifactId = it.name
-                version = it.version
-
-                artifact buildFile
-                from components.java
-            }
-        }
-    }
-
-    publishMavenPublicationToMavenLocal {
-        // Throws an error if we don't explicitly say we're using the output
-        // of reobfJar in the final build.
-        dependsOn(reobfJar)
-    }
-
-    reobfJar {
-        // Make sure it's the correct name for when it's inserted into the publication
-        outputJar.set(buildFile)
-    }
-
-    wrapper {
-        gradleVersion = '8.1.1'
-        distributionType = Wrapper.DistributionType.ALL
-    }
-
 }
 
 subprojects {
@@ -84,18 +53,52 @@ repositories {
     }
 }
 
+
+
 // NMS Versions
 def biomesNMSVersions = ["1.19_R2", "1.19_R3", "1.20_R1", "1.20_R2", "1.20_R3"]
 
 dependencies {
     paperweight.paperDevBundle("1.20-R0.1-SNAPSHOT")
 
-    implementation project(':BiomesAPI-NMS')
+    implementation project(path: ':BiomesAPI-NMS', configuration: 'shadow')
     biomesNMSVersions.each { version ->
-        implementation project(path: ":BiomesAPI-${version}", configuration: 'reobf')
+        implementation project(path: ":BiomesAPI-${version}", configuration: 'shadow')
     }
 
     compileOnly 'org.projectlombok:lombok:1.18.30'
     annotationProcessor 'org.projectlombok:lombok:1.18.30'
 
 }
+
+
+// The file for publication.
+def buildFile = layout.buildDirectory.file("libs/BiomesAPI-${project.version}.jar")
+
+publishing {
+    publications {
+        create('maven', MavenPublication) {
+            groupId = 'com.github.Outspending'
+            artifactId = 'BiomesAPI'
+
+            artifact buildFile
+            from components.java
+        }
+    }
+}
+
+publishMavenPublicationToMavenLocal {
+    // Throws an error if we don't explicitly say we're using the output
+    // of reobfJar in the final build.
+    dependsOn(reobfJar)
+}
+
+reobfJar {
+    // Make sure it's the correct name for when it's inserted into the publication
+    outputJar.set(buildFile)
+}
+
+wrapper {
+    gradleVersion = '8.1.1'
+    distributionType = Wrapper.DistributionType.ALL
+}