Upload both JiJ and shadowed.

Kotori316 · Dec 16, 2022 · 6e66b36 · 6e66b36
1 parent 3e52a15
commit 6e66b36
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -191,7 +191,7 @@ artifacts {
 
 shadowJar {
     def groupNames = ['org.scala-lang', 'org.scala-lang.modules', 'org.typelevel']
-    archiveClassifier.set("with-library")
+    archiveClassifier.set("shadowed")
     dependencies {
         include(dependency {
             groupNames.contains(it.moduleGroup)
@@ -201,11 +201,11 @@ shadowJar {
 }
 
 tasks.jarJar.configure {
-    archiveClassifier.set("with-library-JiJ")
+    archiveClassifier.set("with-library")
 }
 
 reobf {
-    jarJar { }
+    jarJar {}
 }
 tasks.jarJar.finalizedBy('reobfJarJar')
 
@@ -219,10 +219,10 @@ curseforge {
         changelog = project.getChangelog()
         releaseType = 'release'
         addGameVersion(minecraftVersion())
-        mainArtifact(shadowJar)
-        // mainArtifact(tasks.jarJar)
+        mainArtifact(tasks.jarJar)
         addArtifact jar
         addArtifact srcJar
+        addArtifact shadowJar
     }
     options {
         curseGradleOptions.debug = false // defaults to false
@@ -238,7 +238,7 @@ githubRelease {
     body.set(getChangelog())
     releaseAssets = files(
             shadowJar,
-            // tasks.jarJar,
+            tasks.jarJar,
             jar,
             srcJar,
     )
@@ -249,8 +249,12 @@ modrinth {
     token = project.findProperty("modrinthToken") ?: System.getenv("MODRINTH_TOKEN") ?: ""
     projectId = "scalable-cats-force"
     versionType = "release"
-    // uploadFile = tasks.jarJar
-    uploadFile = shadowJar
+    uploadFile = tasks.jarJar
+    additionalFiles = [
+            shadowJar,
+            jar,
+            srcJar,
+    ]
     gameVersions = [minecraftVersion()]
     loaders = ["forge"]
     changelog = project.getChangelog()
@@ -279,9 +283,8 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             artifactId = archivesBaseName.toLowerCase()
-            // from components.java
-            // artifact tasks.jarJar
-            artifact shadowJar
+            from components.java
+            artifact tasks.jarJar
             artifact srcJar
 
             pom {

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 scala_version=2.13.10
 cats_version=2.8.5-kotori
-build_number=14
+build_number=15
 forgeVersion=1.19.3-44.0.23
 branch=1.19
 # https://ldtteam.jfrog.io/ui/native/parchmentmc-public/org/parchmentmc/data/parchment-1.19.2