diff --git a/gradle/build.gradle.kts b/gradle/build.gradle.kts index d4e324633..f62e2491a 100644 --- a/gradle/build.gradle.kts +++ b/gradle/build.gradle.kts @@ -6,8 +6,7 @@ import java.nio.file.Files import java.util.concurrent.atomic.AtomicBoolean plugins { - maven - kotlin("jvm") version "1.5.20" + kotlin("jvm") version "1.9.10" id("org.jetbrains.dokka") version "0.10.1" id("scripts-task") @@ -22,21 +21,15 @@ version = versionObject.toString() val year by extra { "20${versionObject.major}" } val game by extra { "${gameName}_$year" } -val deployDir by extra { buildDir.resolve("deploy") } +val deployDir by extra { layout.buildDirectory.asFile.get().resolve("deploy") } val deployedPlayer by extra { "simpleclient-$gameName-$version.jar" } -val testingDir by extra { buildDir.resolve("tests") } +val testingDir by extra { layout.buildDirectory.asFile.get().resolve("tests") } val documentedProjects = listOf("sdk", "plugin") val isBeta by extra { versionObject.minor == 0 } val enableTestClient by extra { arrayOf("check", "testTestClient").any { gradle.startParameter.taskNames.contains(it) } || !isBeta } val enableIntegrationTesting = !project.hasProperty("nointegration") && (!isBeta || enableTestClient) -val javaTargetVersion = JavaVersion.VERSION_1_8 -val javaVersion = JavaVersion.current() -println("Current version: $version (Beta: $isBeta) Game: $game (Java Version: $javaVersion)") -if (javaVersion != javaTargetVersion) - System.err.println("Java version $javaTargetVersion is recommended - expect issues with generating documentation (consider '-x doc' if you don't care)") - val doAfterEvaluate = ArrayList<(Project) -> Unit>() tasks { val startServer by creating { @@ -133,7 +126,7 @@ tasks { ) .redirectOutput(testGameDir.resolve("server.log")) .redirectError(testGameDir.resolve("server-err.log")) - .directory(project(":server").buildDir.resolve("runnable")) + .directory(project(":server").layout.buildDirectory.asFile.get().resolve("runnable")) .start() var i = 0 while(Files.size(testGameDir.resolve("server.log").toPath()) < 1000 && i++ < 50) @@ -240,7 +233,7 @@ subprojects { apply(plugin = "se.patrikerdes.use-latest-versions") dependencies { - testImplementation(project(":sdk", "testConfig")) + testImplementation(project(":testConfig")) } tasks { @@ -250,7 +243,6 @@ subprojects { withType { kotlinOptions { - jvmTarget = javaTargetVersion.toString() freeCompilerArgs = listOf("-Xjvm-default=all") } if(name.contains("test", true)) { @@ -269,13 +261,13 @@ allprojects { } if (this.name in documentedProjects) { - apply(plugin = "maven") + // apply(plugin = "maven") apply(plugin = "org.jetbrains.dokka") tasks { val doc by creating(DokkaTask::class) { group = "documentation" dependsOn(classes) - outputDirectory = buildDir.resolve("doc").toString() + outputDirectory = layout.buildDirectory.asFile.get().resolve("doc").toString() outputFormat = "javadoc" } val docJar by creating(Jar::class) { @@ -290,9 +282,9 @@ allprojects { archiveClassifier.set("sources") from(sourceSets.main.get().allSource) } - install { - dependsOn(docJar, sourcesJar) - } + // install { + // dependsOn(docJar, sourcesJar) + // } artifacts { archives(sourcesJar.archiveFile) { classifier = "sources" } archives(docJar.archiveFile) { classifier = "javadoc" } diff --git a/gradle/custom-tasks/build.gradle.kts b/gradle/custom-tasks/build.gradle.kts index 65f512e48..9c94df9f7 100644 --- a/gradle/custom-tasks/build.gradle.kts +++ b/gradle/custom-tasks/build.gradle.kts @@ -1,12 +1,12 @@ plugins { - kotlin("jvm") version "1.5.20" + kotlin("jvm") version "1.9.10" `java-gradle-plugin` } sourceSets.main.get().java.setSrcDirs(listOf("src")) repositories { - jcenter() + mavenCentral() } dependencies { diff --git a/gradle/custom-tasks/src/sc/gradle/ScriptsTask.kt b/gradle/custom-tasks/src/sc/gradle/ScriptsTask.kt index 63689d4ea..4ee08c451 100644 --- a/gradle/custom-tasks/src/sc/gradle/ScriptsTask.kt +++ b/gradle/custom-tasks/src/sc/gradle/ScriptsTask.kt @@ -7,7 +7,9 @@ import java.io.File open class ScriptsTask : DefaultTask() { @OutputDirectory lateinit var destinationDir: File + @Input lateinit var fileName: String + @Input lateinit var content: String init { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c02..7f93135c4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c19e35bf7..ac72c34e8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c8..0adc8e1a5 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..6689b85be 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,92 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/helpers/test-client/build.gradle.kts b/helpers/test-client/build.gradle.kts index 3f4371e44..041a1c459 100644 --- a/helpers/test-client/build.gradle.kts +++ b/helpers/test-client/build.gradle.kts @@ -35,7 +35,7 @@ tasks { dependsOn(createStartScripts, copyLogbackConfig) doFirst { manifest.attributes( - "Class-Path" to configurations.default.get() + "Class-Path" to configurations.runtimeClasspath.get() .map { "lib/" + it.name } .plus("server.jar") .joinToString(" ") diff --git a/player/build.gradle.kts b/player/build.gradle.kts index b117d48a8..35fab3138 100644 --- a/player/build.gradle.kts +++ b/player/build.gradle.kts @@ -3,7 +3,7 @@ import org.gradle.internal.os.OperatingSystem plugins { application - id("com.github.johnrengelman.shadow") version "6.1.0" + id("com.github.johnrengelman.shadow") version "8.0.0" } val game: String by project @@ -18,7 +18,7 @@ sourceSets.main { } application { - mainClassName = "sc.player.util.Starter" + mainClass.set("sc.player.util.Starter") } dependencies { @@ -68,7 +68,7 @@ tasks { .replace("TwoPlayerGameState", "GameState") } }, copySpec { - from(configurations.default, arrayOf("sdk", "plugin") + from(configurations.runtimeClasspath, arrayOf("sdk", "plugin") .map { project(":$it").getTasksByName("sourcesJar", false) }) into("lib") }) diff --git a/player/configuration/build.gradle.kts b/player/configuration/build.gradle.kts index 6ff3a64bd..63b3b31f0 100644 --- a/player/configuration/build.gradle.kts +++ b/player/configuration/build.gradle.kts @@ -1,18 +1,18 @@ plugins { java application - id("com.github.johnrengelman.shadow") version "6.1.0" + id("com.github.johnrengelman.shadow") version "8.0.0" } sourceSets.main.get().java.srcDir("src/main") sourceSets.main.get().resources.srcDir("src/resources") application { - mainClassName = "sc.playerYEAR.Starter" + mainClass.set("sc.playerYEAR.Starter") } repositories { - jcenter() + mavenCentral() maven("https://maven.wso2.org/nexus/content/groups/wso2-public/") maven("https://jitpack.io") } diff --git a/plugin/src/test/kotlin/sc/GamePlayTest.kt b/plugin/src/test/kotlin/sc/GamePlayTest.kt index 3f99e8b86..f16e6b991 100644 --- a/plugin/src/test/kotlin/sc/GamePlayTest.kt +++ b/plugin/src/test/kotlin/sc/GamePlayTest.kt @@ -19,7 +19,9 @@ import sc.framework.plugins.Player import sc.shared.PlayerScore import sc.shared.ScoreCause import kotlin.time.Duration +import kotlin.time.DurationUnit import kotlin.time.ExperimentalTime +import kotlin.time.toDuration /** This test verifies that the Game implementation can be used to play a game. * It is the only plugin-test independent of the season. */ @@ -71,7 +73,7 @@ class GamePlayTest: WordSpec({ } }) - "finish without issues".config(invocationTimeout = Duration.milliseconds(plugin.gameTimeout)) { + "finish without issues".config(invocationTimeout = plugin.gameTimeout.toDuration(DurationUnit.MILLISECONDS)) { while (true) { try { val condition = game.checkWinCondition() diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts index 22221ab43..abfd261a7 100644 --- a/sdk/build.gradle.kts +++ b/sdk/build.gradle.kts @@ -1,29 +1,7 @@ sourceSets { main.get().java.setSrcDirs(listOf("framework", "server-api", "player").map { "src/main/$it" }) - create("testConfig") { - java.setSrcDirs(listOf("src/test/config")) - compileClasspath += main.get().output - runtimeClasspath += main.get().output - } } -configurations { - val testConfigApi by getting { extendsFrom(api.get()) } - val testConfig by creating { - extendsFrom(testConfigApi) - isCanBeResolved = false - isCanBeConsumed = true - } -} - -artifacts { - val kt = tasks["compileTestConfigKotlin"] - add("testConfig", kt.outputs.files.singleFile) { - builtBy(kt) - } -} -configurations.archives.get().artifacts.removeIf { it.name == "testConfig" } - dependencies { api(kotlin("stdlib")) api("com.thoughtworks.xstream", "xstream", "1.4.17") @@ -33,7 +11,4 @@ dependencies { implementation("org.hamcrest", "hamcrest-core", "2.2") implementation("net.sf.kxml", "kxml2", "2.3.0") implementation("xmlpull", "xmlpull", "1.1.3.1") - - "testConfigApi"("io.kotest", "kotest-assertions-core") - "testConfigApi"("io.kotest", "kotest-runner-junit5-jvm", "4.6.4") } diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 114d29f03..4e7c7574e 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -45,7 +45,7 @@ tasks { val makeRunnable by creating(Copy::class) { group = "distribution" dependsOn(jar, copyConfig, createStartScripts) - from(configurations.default) + from(configurations.runtimeClasspath) into(runnableDir.resolve("lib")) } @@ -98,7 +98,7 @@ tasks { destinationDirectory.set(runnableDir) doFirst { manifest.attributes( - "Class-Path" to configurations.default.get().joinToString(" ") { "lib/" + it.name } + "Class-Path" to configurations.runtimeClasspath.get().joinToString(" ") { "lib/" + it.name } ) } } diff --git a/server/src/test/java/sc/server/network/LobbyGameTest.kt b/server/src/test/java/sc/server/network/LobbyGameTest.kt index f2b5bec08..17c1a59c8 100644 --- a/server/src/test/java/sc/server/network/LobbyGameTest.kt +++ b/server/src/test/java/sc/server/network/LobbyGameTest.kt @@ -34,13 +34,15 @@ import sc.shared.PlayerScore import sc.shared.ScoreCause import sc.shared.SlotDescriptor import kotlin.time.Duration +import kotlin.time.DurationUnit import kotlin.time.ExperimentalTime +import kotlin.time.toDuration @OptIn(ExperimentalTime::class) suspend fun await( clue: String? = null, - duration: Duration = Duration.seconds(1), - interval: Interval = Duration.milliseconds(20).fibonacci(), + duration: Duration = 1.toDuration(DurationUnit.SECONDS), + interval: Interval = 20.toDuration(DurationUnit.MILLISECONDS).fibonacci(), f: suspend () -> Unit, ) = withClue(clue) { eventually(duration, interval, f) } diff --git a/server/src/test/java/sc/server/network/RealServerTest.kt b/server/src/test/java/sc/server/network/RealServerTest.kt index fda3dce87..57acb2598 100644 --- a/server/src/test/java/sc/server/network/RealServerTest.kt +++ b/server/src/test/java/sc/server/network/RealServerTest.kt @@ -18,7 +18,9 @@ import java.io.IOException import java.net.Socket import java.util.concurrent.TimeUnit import kotlin.time.Duration +import kotlin.time.DurationUnit import kotlin.time.ExperimentalTime +import kotlin.time.toDuration abstract class RealServerTest { protected lateinit var lobby: Lobby @@ -32,9 +34,9 @@ abstract class RealServerTest { LobbyClient("localhost", serverPort).apply { start() } @OptIn(ExperimentalTime::class) - fun await(clue: String? = null, time: Duration = Duration.seconds(1), f: () -> Boolean) = runBlocking { + fun await(clue: String? = null, time: Duration = 1.toDuration(DurationUnit.SECONDS), f: () -> Boolean) = runBlocking { withClue(clue) { - eventually(time, Duration.milliseconds(20).fibonacci(), predicate = { f() }) {} + eventually(time, 20.toDuration(DurationUnit.MILLISECONDS).fibonacci(), predicate = { f() }) {} } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 7b40f9668..7cd9d2417 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,5 +3,5 @@ rootProject.buildFileName = "gradle/build.gradle.kts" includeBuild("gradle/custom-tasks") -include("sdk", "server", "plugin", "player", "test-client") +include("sdk", "server", "plugin", "player", "testConfig", "test-client") project(":test-client").projectDir = file("helpers/test-client") diff --git a/testConfig/build.gradle.kts b/testConfig/build.gradle.kts new file mode 100644 index 000000000..fd0b09a2e --- /dev/null +++ b/testConfig/build.gradle.kts @@ -0,0 +1,6 @@ +dependencies { + api(project(":sdk")) + api("com.thoughtworks.xstream", "xstream", "1.4.17") + api("io.kotest", "kotest-assertions-core") + api("io.kotest", "kotest-runner-junit5-jvm", "4.6.4") +} diff --git a/sdk/src/test/config/KotestConfig.kt b/testConfig/src/main/kotlin/KotestConfig.kt similarity index 82% rename from sdk/src/test/config/KotestConfig.kt rename to testConfig/src/main/kotlin/KotestConfig.kt index fbbf2d58b..3fe90a828 100644 --- a/sdk/src/test/config/KotestConfig.kt +++ b/testConfig/src/main/kotlin/KotestConfig.kt @@ -4,7 +4,9 @@ import io.kotest.core.config.AbstractProjectConfig import io.kotest.core.spec.IsolationMode import io.kotest.core.test.TestCaseOrder import kotlin.time.Duration +import kotlin.time.DurationUnit import kotlin.time.ExperimentalTime +import kotlin.time.toDuration object KotestConfig: AbstractProjectConfig() { override val parallelism = Runtime.getRuntime().availableProcessors() @@ -15,7 +17,7 @@ object KotestConfig: AbstractProjectConfig() { private const val timeoutSecs = 10 override val invocationTimeout = timeoutSecs * 1000L @OptIn(ExperimentalTime::class) - override val timeout = Duration.seconds(timeoutSecs.times(5)) + override val timeout = timeoutSecs.times(5).toDuration(DurationUnit.SECONDS) init { System.setProperty("kotest.assertions.multi-line-diff", "simple") diff --git a/sdk/src/test/config/sc/helpers/XStreamMatcher.kt b/testConfig/src/main/kotlin/sc/helpers/XStreamMatcher.kt similarity index 100% rename from sdk/src/test/config/sc/helpers/XStreamMatcher.kt rename to testConfig/src/main/kotlin/sc/helpers/XStreamMatcher.kt