Merge pull request #86 from 3arthqu4ke/1.7.2

[1.7.2] Use shadowjars instead of dev jars

.github/workflows/docker_no_push.yml

@@ -0,0 +1,29 @@
+name: Docker test image build
+
+on:
+  push:
+  pull_request:
+    types: [opened, reopened]
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Build
+        uses: docker/build-push-action@v4
+        with:
+          push: false
+          tags: 3arthqu4ke/headlessmc:latest
+      - name: Publish bat script
+        uses: actions/upload-artifact@v3
+        with:
+          name: HeadlessMc
+          path: ./headlessmc-scripts/hmc.bat
+

build.gradle

@@ -131,9 +131,13 @@ allprojects {
         }
     }
 
+    jar {
+        classifier 'dev'
+    }
+
     shadowJar {
         configurations = [project.configurations.jarLibs, project.configurations.jarLibsApi]
-        classifier 'release'
+        classifier ''
     }
 
     jar.finalizedBy(shadowJar)
@@ -208,13 +212,13 @@ tasks.register('jacocoRootReport', JacocoReport) {
 }
 
 tasks.register('copyJars', Copy) {
-    dependsOn subprojects.jar
-    from(subprojects.jar)
+    dependsOn subprojects.shadowJar
+    from(subprojects.shadowJar)
     into project.file(System.getProperty('hmc.jar.dir', 'build/libs'))
 }
 
-jar {
-    dependsOn(subprojects.jar)
+build {
+    dependsOn(subprojects.shadowJar)
     finalizedBy(copyJars)
 }
 

gradle.properties

@@ -1 +1 @@
-project_version=1.7.1
+project_version=1.7.2

headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/Launcher.java

@@ -15,7 +15,7 @@
 @Getter
 @RequiredArgsConstructor
 public class Launcher implements HeadlessMc {
-    public static final String VERSION = "1.7.1";
+    public static final String VERSION = "1.7.2";
 
     @Delegate
     private final HeadlessMc headlessMc;

headlessmc-lwjgl/build.gradle

@@ -75,7 +75,7 @@ tasks.register('testAgent', Test) {
     }
 
     jvmArgs = [
-        "-javaagent:$projectDir/build/libs/headlessmc-lwjgl-${rootProject.version}-release.jar",
+        "-javaagent:$projectDir/build/libs/headlessmc-lwjgl-${rootProject.version}.jar",
         '-Dhmc.lwjgl.agenttest=true'
     ]
 

headlessmc-scripts/hmc

@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-java -jar headlessmc-launcher-1.7.1.jar --command $@
+java -jar headlessmc-launcher-1.7.2.jar --command $@

headlessmc-scripts/hmc.bat

@@ -1,2 +1,2 @@
 @echo off
-"%JAVA_HOME%\bin\java" -jar headlessmc-launcher-1.7.1.jar --command %*
+"%JAVA_HOME%\bin\java" -jar headlessmc-launcher-1.7.2.jar --command %*

headlessmc-scripts/hmw

@@ -1,3 +1,3 @@
 #!/bin/bash
 # when running in docker on windows bash seems to be at /bin/bash TODO: can we make this one script?
-java -jar headlessmc-launcher-1.7.1.jar --command $@
+java -jar headlessmc-launcher-1.7.2.jar --command $@