diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..107b91ff9 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,26 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.20.2") + } +} + +plugins { + kotlin("jvm") version "1.8.21" +} + +subprojects { + plugins.apply("kotlinx-atomicfu") +} + +dependencies { + implementation(kotlin("stdlib-jdk8")) +} +repositories { + mavenCentral() +} +kotlin { + jvmToolchain(17) +} diff --git a/gradle.properties b/gradle.properties index 3d37a5615..4cae273da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,3 +6,5 @@ org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAME --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED kotlin.code.style=official +# https://github.com/Kotlin/kotlinx-atomicfu#atomicfu-compiler-plugin +kotlinx.atomicfu.enableJvmIrTransformation=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..c1962a79e 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 070cb702f..37aef8d3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c78733..aeb74cbb4 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# 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/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ 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 @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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 @@ -205,6 +210,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..93e3f59f1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 6c677489e..1e384cf0a 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -12,9 +12,9 @@ plugins { kotlin("jvm") version "1.8.21" kotlin("plugin.serialization") version "1.8.21" application - id("com.github.johnrengelman.shadow") version "7.1.2" + id("com.github.johnrengelman.shadow") version "8.1.1" id("com.diffplug.spotless") version "6.12.0" - id("com.github.gmazzo.buildconfig") version "3.1.0" + id("com.github.gmazzo.buildconfig") version "4.0.4" } kotlin { @@ -66,14 +66,14 @@ dependencies { // This dependency is used internally, // and not exposed to consumers on their own compile classpath. implementation("com.google.flatbuffers:flatbuffers-java:22.10.26") - implementation("commons-cli:commons-cli:1.3.1") - implementation("com.fasterxml.jackson.core:jackson-databind:2.12.7.1") - implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3") + implementation("commons-cli:commons-cli:1.5.0") + implementation("com.fasterxml.jackson.core:jackson-databind:2.15.1") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.1") implementation("com.github.jonpeterson:jackson-module-model-versioning:1.2.2") implementation("org.apache.commons:commons-math3:3.6.1") implementation("org.apache.commons:commons-lang3:3.12.0") - implementation("org.apache.commons:commons-collections4:4.1") + implementation("org.apache.commons:commons-collections4:4.4") implementation("net.java.dev.jna:jna:5.+") implementation("net.java.dev.jna:jna-platform:5.+") @@ -82,7 +82,7 @@ dependencies { implementation("com.google.protobuf:protobuf-java:3.21.12") implementation("org.java-websocket:Java-WebSocket:1.+") implementation("com.melloware:jintellitype:1.+") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0-RC") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1") implementation("it.unimi.dsi:fastutil:8.5.12") testImplementation(kotlin("test")) @@ -163,7 +163,7 @@ configure { // "max_line_length" to 88, "ktlint_experimental" to "enabled", "ij_kotlin_packages_to_use_import_on_demand" to - "java.util.*,kotlin.math.*,dev.slimevr.autobone.errors.*,io.github.axisangles.ktmath.*", + "java.util.*,kotlin.math.*,dev.slimevr.autobone.errors.*,io.github.axisangles.ktmath.*,kotlinx.atomicfu.*", "ij_kotlin_allow_trailing_comma" to true ) val ktlintVersion = "0.47.1" diff --git a/server/spotless.xml b/server/spotless.xml index c54ea2bde..0e364f183 100644 --- a/server/spotless.xml +++ b/server/spotless.xml @@ -1,6 +1,6 @@ - - + + @@ -158,6 +158,7 @@ + diff --git a/server/src/main/java/dev/slimevr/tracking/trackers/Device.kt b/server/src/main/java/dev/slimevr/tracking/trackers/Device.kt index 8a05b3e9d..c94e0e87b 100644 --- a/server/src/main/java/dev/slimevr/tracking/trackers/Device.kt +++ b/server/src/main/java/dev/slimevr/tracking/trackers/Device.kt @@ -2,6 +2,7 @@ package dev.slimevr.tracking.trackers import dev.slimevr.tracking.trackers.udp.BoardType import dev.slimevr.tracking.trackers.udp.MCUType +import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicInteger open class Device { @@ -9,7 +10,7 @@ open class Device { open var name: String? = null open var firmwareVersion: String? = null open var manufacturer: String? = null - open val trackers = HashMap() + open val trackers: MutableMap = ConcurrentHashMap() /** * Implement toString() to return a string that uniquely identifies the board type @@ -21,7 +22,7 @@ open class Device { open val hardwareIdentifier: String = "Unknown" companion object { - @JvmField - val nextLocalDeviceId = AtomicInteger() + @JvmStatic + protected val nextLocalDeviceId = AtomicInteger() } } diff --git a/server/src/main/java/dev/slimevr/tracking/trackers/udp/UDPDevice.kt b/server/src/main/java/dev/slimevr/tracking/trackers/udp/UDPDevice.kt index f6453d0a5..3faea3d15 100644 --- a/server/src/main/java/dev/slimevr/tracking/trackers/udp/UDPDevice.kt +++ b/server/src/main/java/dev/slimevr/tracking/trackers/udp/UDPDevice.kt @@ -5,6 +5,7 @@ import dev.slimevr.tracking.trackers.Device import dev.slimevr.tracking.trackers.Tracker import java.net.InetAddress import java.net.SocketAddress +import java.util.concurrent.ConcurrentHashMap class UDPDevice( var address: SocketAddress, @@ -50,7 +51,7 @@ class UDPDevice( @JvmField var timedOut = false - override val trackers = HashMap() + override val trackers = ConcurrentHashMap() fun isNextPacket(packetId: Long): Boolean { if (packetId != 0L && packetId <= lastPacketNumber) return false