From 1fba4e67ab95e4db497742597acdccefe0a1f7ee Mon Sep 17 00:00:00 2001 From: Butterscotch! Date: Mon, 12 Aug 2024 21:44:06 -0400 Subject: [PATCH] Fix Android build & OSC support (#1133) --- server/android/proguard-rules.pro | 3 +++ server/core/build.gradle.kts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/android/proguard-rules.pro b/server/android/proguard-rules.pro index 779408dde..d2177735e 100644 --- a/server/android/proguard-rules.pro +++ b/server/android/proguard-rules.pro @@ -24,6 +24,9 @@ -dontwarn org.apache.logging.log4j.message.MessageFactory -dontwarn org.apache.logging.log4j.spi.ExtendedLogger -dontwarn org.apache.logging.log4j.spi.ExtendedLoggerWrapper +-dontwarn org.apache.log4j.Level +-dontwarn org.apache.log4j.Logger +-dontwarn org.apache.log4j.Priority -dontwarn org.conscrypt.BufferAllocator -dontwarn org.conscrypt.Conscrypt -dontwarn org.conscrypt.HandshakeListener diff --git a/server/core/build.gradle.kts b/server/core/build.gradle.kts index 228d734b0..8f6bb3577 100644 --- a/server/core/build.gradle.kts +++ b/server/core/build.gradle.kts @@ -69,7 +69,7 @@ dependencies { implementation("org.apache.commons:commons-lang3:3.12.0") implementation("org.apache.commons:commons-collections4:4.4") - implementation("com.illposed.osc:javaosc-core:0.9") + implementation("com.illposed.osc:javaosc-core:0.8") implementation("org.java-websocket:Java-WebSocket:1.+") implementation("com.melloware:jintellitype:1.+") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")