improve simplifyArtifact tasks

Author: burdoto

.github/workflows/release-artifacts.yml

@@ -25,30 +25,60 @@ jobs:
         with:
           java-version: '17'
 
-# api artifact
-      - name: Build API Artifact
-        run: ./gradlew :api:simplifyArtifact
+      - name: Build Artifacts
+        run: ./gradlew simplifyArtifact
+
       - name: Upload API JAR to Release
         id: upload-api-assets
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: api/build/libs/mcsd-api.jar
-          asset_name: "mcsd-api-${{ github.event.release.tag_name }}.zip"
+          asset_path: build/libs/mcsd-api.jar
+          asset_name: "mcsd-api-${{ github.event.release.tag_name }}.jar"
+          asset_content_type: application/java-archive
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Core JAR to Release
+        id: upload-api-assets
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: build/libs/mcsd-core.jar
+          asset_name: "mcsd-core-${{ github.event.release.tag_name }}.jar"
           asset_content_type: application/java-archive
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          
-# spigot artifact
-      - name: Build Spigot Artifact
-        run: ./gradlew :spigot:testPlugin
+
       - name: Upload Spigot Plugin to Release
         id: upload-spigot-assets
         uses: actions/upload-release-asset@v1
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: spigot/run/plugins/mcsd-spigot.jar
-          asset_name: "mcsd-spigot-${{ github.event.release.tag_name }}.zip"
+          asset_path: build/libs/mcsd-spigot.jar
+          asset_name: "mcsd-spigot-${{ github.event.release.tag_name }}.jar"
+          asset_content_type: application/java-archive
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Forge Mod to Release
+        id: upload-forge-assets
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: build/libs/mcsd-forge.jar
+          asset_name: "mcsd-forge-${{ github.event.release.tag_name }}.jar"
+          asset_content_type: application/java-archive
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Fabric Mod to Release
+        id: upload-fabric-assets
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: build/libs/mcsd-fabric.jar
+          asset_name: "mcsd-fabric-${{ github.event.release.tag_name }}.jar"
           asset_content_type: application/java-archive
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

api/build.gradle

@@ -42,8 +42,9 @@ dependencies {
 }
 
 task simplifyArtifact(type: Copy) {
+    // api module should be slim, and only contain mcsd's own api
     dependsOn jar
     from jar.outputs.files.singleFile
-    into "$buildDir/libs/"
+    into "$rootDir/build/libs/"
     rename { n -> "mcsd-api.jar" }
 }

core/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'java-library'
     id 'org.springframework.boot' version '3.0.+'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'io.spring.dependency-management' version '1.0.15.RELEASE'
 }
 
@@ -120,3 +121,18 @@ dependencies {
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'io.projectreactor:reactor-test'
 }
+
+shadowJar {
+    dependsOn project(':api').simplifyArtifact
+
+    configurations.clear()
+    from sourceSets.main.output
+    from project(':api').sourceSets.main.output
+}
+
+task simplifyArtifact(type: Copy) {
+    dependsOn shadowJar
+    from shadowJar.outputs.files.singleFile
+    into "$rootDir/build/libs/"
+    rename { n -> "mcsd-core.jar" }
+}

fabric/build.gradle

@@ -133,4 +133,15 @@ publishing {
 
 		mavenLocal()
 	}
-}
+}
+
+shadowJar {
+	dependsOn project(':api').simplifyArtifact
+}
+
+task simplifyArtifact(type: Copy) {
+	dependsOn remappedShadowJar
+	from remappedShadowJar.outputs.files.singleFile
+	into "$rootDir/build/libs/"
+	rename { n -> "mcsd-fabric.jar" }
+}

forge/build.gradle

@@ -1,4 +1,6 @@
 plugins {
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id "de.undercouch.download" version "5.5.0"
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
@@ -153,7 +155,7 @@ dependencies {
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
     // mcsd api
-    implementation project(':api') // todo: include as jarjar
+    implementation project(':api')
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.
@@ -215,3 +217,14 @@ publishing {
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }
+
+shadowJar {
+    dependsOn project(':api').simplifyArtifact
+}
+
+task simplifyArtifact(type: Copy) {
+    dependsOn shadowJar
+    from shadowJar.outputs.files.singleFile
+    into "$rootDir/build/libs/"
+    rename { n -> "mcsd-forge.jar" }
+}

spigot/build.gradle

@@ -26,13 +26,24 @@ tasks.register('serverJar', Copy) {
     rename { n -> "server.jar" }
 }
 
+shadowJar {
+    dependsOn project(':api').simplifyArtifact
+}
+
 tasks.register('testPlugin', Copy) {
     dependsOn shadowJar, serverJar
     from shadowJar.outputs.files.singleFile
     into "${projectDir}/run/plugins"
     rename { n -> "mcsd-spigot.jar" }
 }
 
+task simplifyArtifact(type: Copy) {
+    dependsOn shadowJar
+    from shadowJar.outputs.files.singleFile
+    into "$rootDir/build/libs/"
+    rename { n -> "mcsd-spigot.jar" }
+}
+
 repositories {
     mavenCentral()
     maven {

src/forge/main/java/org/comroid/mcsd/forge/Config.java

@@ -9,9 +9,6 @@
 import net.minecraftforge.fml.event.config.ModConfigEvent;
 import net.minecraftforge.registries.ForgeRegistries;
 import org.comroid.api.Polyfill;
-import org.comroid.mcsd.api.dto.AgentInfo;
-import org.comroid.mcsd.api.dto.PlayerEvent;
-import org.comroid.util.REST;
 
 import java.util.List;
 import java.util.Set;
@@ -33,7 +30,7 @@ public class Config
 
     static final ForgeConfigSpec SPEC = BUILDER.build();
 
-    static AgentInfo info;
+    //static AgentInfo info;
 
     private static boolean validateItemName(final Object obj)
     {
@@ -48,6 +45,6 @@ static void onLoad(final ModConfigEvent event)
         var hubBaseUrl=Token.get();
         var token=BaseUrl.get();
         var baseUrl=HubBaseUrl.get();
-        info=new AgentInfo(target,agent,hubBaseUrl,token,baseUrl);
+        //info=new AgentInfo(target,agent,hubBaseUrl,token,baseUrl);
     }
 }

src/forge/main/java/org/comroid/mcsd/forge/MCSD_Forge.java

@@ -31,8 +31,6 @@
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 import org.comroid.api.Polyfill;
-import org.comroid.mcsd.api.dto.PlayerEvent;
-import org.comroid.util.REST;
 import org.slf4j.Logger;
 
 // The value here should match an entry in the META-INF/mods.toml file
@@ -73,10 +71,10 @@ public void onServerStarting(ServerStartingEvent event)
 
     @SubscribeEvent
     static void onChat(final ServerChatEvent event) {
-        REST.put(Config.info.getHubBaseUrl()+"/api/agent/chat"+Config.info.getAgent(),
-                        new PlayerEvent(event.getUsername(), event.getMessage().getString(), PlayerEvent.Type.Chat).json())
-                .thenApply(REST.Response::validate2xxOK)
-                .exceptionally(Polyfill.exceptionLogger());
+//        REST.put(Config.info.getHubBaseUrl()+"/api/agent/chat"+Config.info.getAgent(),
+//                        new PlayerEvent(event.getUsername(), event.getMessage().getString(), PlayerEvent.Type.Chat).json())
+//                .thenApply(REST.Response::validate2xxOK)
+//                .exceptionally(Polyfill.exceptionLogger());
     }
 
     // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent