fix(player): update buildscripts

Author: xeruf

CHANGELOG.md

@@ -7,9 +7,11 @@ The version should always be in sync with the [GUI](https://github.com/software-
 
 - The major version `x` corresponds to the year of the contest and thus only changes once a year
 - `y` is bumped for any major updates or backwards-incompatible changes.  
-  A `y` version of 0 marks the beta of the current year.
+  A `y` version of 0 marks the beta of the current year
+  and likely contains breaking changes between patches.
 
-## [22.1.0](https://github.com/software-challenge/backend/commits/22.1.0) - 2021-09
+## [22.1.0](https://github.com/software-challenge/backend/commits/22.1.0) - 2021-08
+- Fix player buildscripts
 
 ## [22.0.2](https://github.com/software-challenge/backend/commits/22.0.2) - 2021-07-16
 - Update documentation links

player/build.gradle.kts

@@ -1,3 +1,4 @@
+import java.time.Duration
 import org.gradle.internal.os.OperatingSystem
 
 plugins {
@@ -61,7 +62,8 @@ tasks {
             from("src")
             into("src")
         }, copySpec {
-            from(configurations.default, arrayOf("sdk", "plugin").map { project(":$it").getTasksByName("sourcesJar", false).single().outputs.files })
+            from(configurations.default, arrayOf("sdk", "plugin")
+                    .map { project(":$it").getTasksByName("sourcesJar", false) })
             into("lib")
         })
     }
@@ -86,35 +88,30 @@ tasks {
         archiveFileName.set("simpleclient-$gameName-src.zip")
     }
 
-    val playerTest by creating(Copy::class) {
+    val playerTest by creating(Exec::class) {
         group = "verification"
-        from(prepareZip)
+        dependsOn(prepareZip)
         val execDir = testingDir.resolve("player")
-        into(execDir)
         doFirst {
-            execDir.deleteRecursively()
-            execDir.mkdirs()
+            delete { delete(execDir) }
+            copy {
+                from(prepareZip)
+                into(execDir)
+            }
+            // required by gradle to distinguish the test build
+            execDir.resolve("settings.gradle").createNewFile()
         }
 
+        timeout.set(Duration.ofMinutes(1))
+        workingDir(execDir)
+        executable = "./gradlew${if (OperatingSystem.current().isWindows) ".bat" else ""}"
+        args("shadowJar", "--quiet", "--offline")
+        
         doLast {
-            // required by gradle to distinguish the test build from
-            execDir.resolve("settings.gradle").createNewFile()
-            val command = arrayListOf(
-                    "./gradlew${if(OperatingSystem.current().isWindows) ".bat" else ""}",
-                    "shadowJar", "--quiet", "--offline")
-            val process = ProcessBuilder(command).directory(execDir)
-                    .redirectOutput(execDir.resolve("player-shadowJar-build.log"))
-                    .redirectError(execDir.resolve("player-shadowJar-err.log"))
-                    .start()
-            val timeout = 5L
-            if(process.waitFor(timeout, TimeUnit.MINUTES)) {
-                val result = process.exitValue()
-                if(result != 0 || !execDir.resolve("${game}_client.jar").exists())
-                    throw Exception("Player was not generated by shipped gradlew script!")
-            } else {
-                throw Exception("Gradlew shadowJar for player did not finish within $timeout minutes!")
+            exec {
+                commandLine("java", "-jar", execDir.resolve("${game}_client.jar"), "--verify")
+                standardOutput = org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM
             }
-            println("Successfully generated client jar from shipped source")
         }
     }
 

player/configuration/build.xml

@@ -55,6 +55,7 @@
     <target name="build-jar" depends="compile">
         <jar destfile="${jar.dir}/${ant.project.name}.jar"
              basedir="${classes.dir}">
+            <fileset dir="src/resources" includes="**" />
             <manifest>
                 <attribute name="Main-Class" value="${main-class}"/>
                 <attribute name="Class-Path" value="${jar.classpath}"/>
@@ -63,8 +64,6 @@
         <copy todir="${jar.dir}/lib" >
             <path refid="classpath.libs" />
         </copy>
-        <copy file="src/logback.xml"
-              tofile="${jar.dir}/logback.xml"/>
     </target>
 
     <target name="build" depends="build-jar" description="Build only"/>

player/src/main/sc/player2021/Starter.java renamed to player/src/main/sc/player2022/Starter.java

@@ -1,4 +1,4 @@
-package sc.player2021;
+package sc.player2022;
 
 import jargs.gnu.CmdLineParser;
 import org.slf4j.Logger;
@@ -7,7 +7,8 @@
 import sc.networking.clients.LobbyClient;
 import sc.player.IGameHandler;
 import sc.player.IPlayerClient;
-import sc.player2021.logic.Logic;
+import sc.player2022.logic.Logic;
+import sc.plugin2022.util.Constants;
 import sc.shared.SharedConfiguration;
 
 import java.io.File;
@@ -44,6 +45,7 @@ public static void main(String[] args) {
     CmdLineParser.Option portOption = parser.addIntegerOption('p', "port");
     CmdLineParser.Option reservationOption = parser.addStringOption('r', "reservation");
     CmdLineParser.Option roomOption = parser.addStringOption("room");
+    CmdLineParser.Option verifyOption = parser.addBooleanOption("verify");
 
     try {
       // Parameter auslesen
@@ -54,6 +56,9 @@ public static void main(String[] args) {
       System.exit(2);
     }
 
+    if(parser.getOptionValue(verifyOption) == Boolean.TRUE)
+      System.exit(0);
+
     // Parameter laden
     String host = (String) parser.getOptionValue(hostOption, "localhost");
     int port = (Integer) parser.getOptionValue(portOption, SharedConfiguration.DEFAULT_PORT);

player/src/main/sc/player2021/logic/Logic.java renamed to player/src/main/sc/player2022/logic/Logic.java

@@ -1,4 +1,4 @@
-package sc.player2021.logic;
+package sc.player2022.logic;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;