github/SlimeVR-Server
1
1
Fork 0
mirror of https://github.com/SlimeVR/SlimeVR-Server.git synced 2026-04-05 18:01:56 +02:00
Code Issues 157 Packages Projects Releases Wiki Activity

Bump Gradle, plugin, and package versions (#1746)

Browse Source 
Co-authored-by: lucas lelievre <loucass003@gmail.com>
This commit is contained in:
Butterscotch!
2026-03-10 17:40:41 -04:00
committed by GitHub
parent 653b8b4014
commit b829a20169
12 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gradle.properties
View File

@@ -13,8 +13,10 @@ android.useAndroidX=true
android.nonTransitiveRClass=true android.nonTransitiveRClass=true
org.gradle.unsafe.configuration-cache=false org.gradle.unsafe.configuration-cache=false
kotlinVersion=2.0.20 kotlinVersion=2.3.10
spotlessVersion=8.0.0 spotlessVersion=8.2.1
shadowJarVersion=8.3.2 shadowJarVersion=9.3.1
buildconfigVersion=5.5.0 buildconfigVersion=6.0.7
grgitVersion=5.2.2 # We should probably stop using grgit, see:
# https://andrewoberstar.com/posts/2024-04-02-dont-commit-to-grgit/
grgitVersion=5.3.3

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 distributionSha256Sum=f1771298a70f6db5a29daf62378c4e18a17fc33c9ba6b14362e0cdf40610380d
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

10
server/android/build.gradle.kts
View File

@@ -16,7 +16,7 @@ plugins {
kotlin("plugin.serialization") kotlin("plugin.serialization")
id("com.github.gmazzo.buildconfig") id("com.github.gmazzo.buildconfig")
id("com.android.application") version "8.13.1" id("com.android.application") version "8.13.2"
id("org.ajoberstar.grgit") id("org.ajoberstar.grgit")
} }
@@ -106,8 +106,8 @@ repositories {
dependencies { dependencies {
implementation(project(":server:core")) implementation(project(":server:core"))
implementation("commons-cli:commons-cli:1.8.0") implementation("commons-cli:commons-cli:1.11.0")
implementation("org.apache.commons:commons-lang3:3.15.0") implementation("org.apache.commons:commons-lang3:3.20.0")
// Android stuff // Android stuff
implementation("androidx.appcompat:appcompat:1.7.1") implementation("androidx.appcompat:appcompat:1.7.1")
@@ -220,8 +220,4 @@ android {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17
} }
kotlinOptions {
jvmTarget = "17"
}
} }

4
server/build.gradle.kts
View File

@@ -43,7 +43,7 @@ configure<com.diffplug.gradle.spotless.SpotlessExtension> {
",solarxr_protocol.rpc.*,kotlinx.coroutines.*,com.illposed.osc.*,android.app.*", ",solarxr_protocol.rpc.*,kotlinx.coroutines.*,com.illposed.osc.*,android.app.*",
"ij_kotlin_allow_trailing_comma" to true, "ij_kotlin_allow_trailing_comma" to true,
) )
val ktlintVersion = "1.7.1" val ktlintVersion = "1.8.0"
kotlinGradle { kotlinGradle {
target("**/*.gradle.kts") // default target for kotlinGradle target("**/*.gradle.kts") // default target for kotlinGradle
ktlint(ktlintVersion) ktlint(ktlintVersion)
@@ -61,7 +61,7 @@ configure<com.diffplug.gradle.spotless.SpotlessExtension> {
removeUnusedImports() removeUnusedImports()
// Use eclipse JDT formatter // Use eclipse JDT formatter
eclipse("4.36") eclipse("4.38")
.configFile("spotless.xml") .configFile("spotless.xml")
// .withP2Mirrors(mapOf("https://download.eclipse.org/" to "https://mirror.umd.edu/eclipse/")) // .withP2Mirrors(mapOf("https://download.eclipse.org/" to "https://mirror.umd.edu/eclipse/"))
} }

20
server/core/build.gradle.kts
View File

@@ -63,21 +63,21 @@ dependencies {
// This dependency is used internally, // This dependency is used internally,
// and not exposed to consumers on their own compile classpath. // and not exposed to consumers on their own compile classpath.
implementation("com.google.flatbuffers:flatbuffers-java:22.10.26") implementation("com.google.flatbuffers:flatbuffers-java:22.10.26")
implementation("commons-cli:commons-cli:1.8.0") implementation("commons-cli:commons-cli:1.11.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.1") implementation("com.fasterxml.jackson.core:jackson-databind:2.21.0")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.1") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.0")
implementation("com.github.jonpeterson:jackson-module-model-versioning:1.2.2") 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-math3:3.6.1")
implementation("org.apache.commons:commons-lang3:3.15.0") implementation("org.apache.commons:commons-lang3:3.20.0")
implementation("org.apache.commons:commons-collections4:4.4") implementation("org.apache.commons:commons-collections4:4.5.0")
implementation("com.illposed.osc:javaosc-core:0.8") implementation("com.illposed.osc:javaosc-core:0.9")
implementation("org.java-websocket:Java-WebSocket:1.+") implementation("org.java-websocket:Java-WebSocket:1.+")
implementation("com.melloware:jintellitype:1.+") implementation("com.melloware:jintellitype:1.+")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
implementation("com.mayakapps.kache:kache:2.1.0") implementation("com.mayakapps.kache:kache:2.1.1")
api("com.github.loucass003:EspflashKotlin:v0.11.0") api("com.github.loucass003:EspflashKotlin:v0.11.0")
@@ -89,7 +89,7 @@ dependencies {
testImplementation(kotlin("test")) testImplementation(kotlin("test"))
// Use JUnit test framework // Use JUnit test framework
testImplementation(platform("org.junit:junit-bom:5.10.3")) testImplementation(platform("org.junit:junit-bom:6.0.2"))
testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.junit.platform:junit-platform-launcher") testImplementation("org.junit.platform:junit-platform-launcher")
} }

2
server/core/src/main/java/dev/slimevr/osc/VRCOSCHandler.kt
View File

@@ -199,7 +199,7 @@ class VRCOSCHandler(
try { try {
val addr = InetAddress.getByName(ip) val addr = InetAddress.getByName(ip)
oscSender = OSCPortOut(InetSocketAddress(addr, portOut)) oscSender = OSCPortOut(InetSocketAddress(addr, portOut))
if (oscPortOut != portOut && oscIp != addr || !wasConnected) { if ((oscPortOut != portOut && oscIp != addr) || !wasConnected) {
LogManager.info("[VRCOSCHandler] Sending to port $portOut at address $ip") LogManager.info("[VRCOSCHandler] Sending to port $portOut at address $ip")
} }
oscPortOut = portOut oscPortOut = portOut

6
server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt
View File

@@ -1230,8 +1230,10 @@ class HumanSkeleton(
} }
// If trackingArmFromController, reverse // If trackingArmFromController, reverse
if (((boneType == BoneType.LEFT_LOWER_ARM || boneType == BoneType.LEFT_HAND) && isTrackingLeftArmFromController) || if (((boneType == BoneType.LEFT_LOWER_ARM || boneType == BoneType.LEFT_HAND) && isTrackingLeftArmFromController) ||
(boneType == BoneType.RIGHT_LOWER_ARM || boneType == BoneType.RIGHT_HAND) && (
isTrackingRightArmFromController (boneType == BoneType.RIGHT_LOWER_ARM || boneType == BoneType.RIGHT_HAND) &&
isTrackingRightArmFromController
)
) { ) {
transOffset = -transOffset transOffset = -transOffset
} }

2
server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/Localizer.kt
View File

@@ -386,7 +386,7 @@ class Localizer(humanSkeleton: HumanSkeleton) {
if (rightKnee.y * SITTING_KNEE_THRESHOLD < rightKnee.x + rightKnee.z) { if (rightKnee.y * SITTING_KNEE_THRESHOLD < rightKnee.x + rightKnee.z) {
right = true right = true
} }
return !bufCur.isStanding || left && right return !bufCur.isStanding || (left && right)
} }
// get the combined accel of the Torso trackers // get the combined accel of the Torso trackers

2
server/core/src/main/java/dev/slimevr/tracking/trackers/udp/TrackersUDPServer.kt
View File

@@ -654,12 +654,10 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
private val SENSOR_OFFSET_CORRECTION = Quaternion.rotationAroundZAxis(-FastMath.HALF_PI) private val SENSOR_OFFSET_CORRECTION = Quaternion.rotationAroundZAxis(-FastMath.HALF_PI)
private const val RESET_SOURCE_NAME = "TrackerServer" private const val RESET_SOURCE_NAME = "TrackerServer"
@ExperimentalStdlibApi
private val hexFormat = HexFormat { private val hexFormat = HexFormat {
bytes.byteSeparator = "," bytes.byteSeparator = ","
} }
@OptIn(ExperimentalStdlibApi::class)
private fun packetToString(packet: DatagramPacket?): String { private fun packetToString(packet: DatagramPacket?): String {
val sb = StringBuilder() val sb = StringBuilder()
sb.append("DatagramPacket{") sb.append("DatagramPacket{")

4
server/desktop/build.gradle.kts
View File

@@ -58,8 +58,8 @@ dependencies {
implementation(project(":server:core")) implementation(project(":server:core"))
implementation(project(":solarxr-protocol")) implementation(project(":solarxr-protocol"))
implementation("commons-cli:commons-cli:1.8.0") implementation("commons-cli:commons-cli:1.11.0")
implementation("org.apache.commons:commons-lang3:3.15.0") implementation("org.apache.commons:commons-lang3:3.20.0")
implementation("com.google.protobuf:protobuf-java:4.31.1") implementation("com.google.protobuf:protobuf-java:4.31.1")
implementation("net.java.dev.jna:jna:5.+") implementation("net.java.dev.jna:jna:5.+")
implementation("net.java.dev.jna:jna-platform:5.+") implementation("net.java.dev.jna:jna-platform:5.+")

2
server/desktop/src/main/java/dev/slimevr/desktop/games/vrchat/RegEdit.kt
View File

@@ -86,7 +86,6 @@ class RegEditLinux : AbstractRegEdit() {
} }
lateinit var registry: Map<String, String> lateinit var registry: Map<String, String>
@OptIn(ExperimentalStdlibApi::class)
override fun getQwordValue(path: String, key: String): Double? { override fun getQwordValue(path: String, key: String): Double? {
val value = registry[key] ?: return null val value = registry[key] ?: return null
if (!value.startsWith("hex(4):")) { if (!value.startsWith("hex(4):")) {
@@ -152,7 +151,6 @@ class RegEditLinux : AbstractRegEdit() {
} }
val KEY_VALUE_PATTERN = Regex(""""(.+)"=(.+)""") val KEY_VALUE_PATTERN = Regex(""""(.+)"=(.+)""")
@OptIn(ExperimentalStdlibApi::class)
val HEX_FORMAT = HexFormat { val HEX_FORMAT = HexFormat {
upperCase = false upperCase = false
bytes.byteSeparator = "," bytes.byteSeparator = ","

9
server/desktop/src/main/java/dev/slimevr/desktop/platform/SteamVRBridge.kt
View File

@@ -375,12 +375,9 @@ abstract class SteamVRBridge(
// External battery reporting anything > 0V. // External battery reporting anything > 0V.
// The following should catch internal battery reporting and erroneous // The following should catch internal battery reporting and erroneous
// readings. // readings.
if (((lowestLevel >= 200) || (lowestLevel < 0)) || if ((lowestLevel >= 200 || lowestLevel < 0) ||
( (trackerVoltage < 3.2 && lowestLevel <= 0) ||
(trackerVoltage < 3.2) && (trackerVoltage >= 5 && lowestLevel > 150)
(lowestLevel <= 0) ||
((trackerVoltage >= 5) && (lowestLevel > 150))
)
) { ) {
return return
} else { } else {