From ae83461fe1f6bca1b1c4706b976e49d38286066a Mon Sep 17 00:00:00 2001 From: Priyadarshini Dutta Date: Sun, 18 Feb 2024 19:50:47 +0000 Subject: [PATCH] fix(arm64): lwjgl for macOS-arm64, protoc 3.17.0 -> 3.22.0 Co-authored-by: priya4991 --- build.gradle.kts | 2 +- engine/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 67923d961c3..2a8917f9e41 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -81,7 +81,7 @@ val codeMetrics = configurations.create("codeMetrics") dependencies { // For the "natives" configuration make it depend on the native files from LWJGL natives(platform("org.lwjgl:lwjgl-bom:$LwjglVersion")) - listOf("natives-linux", "natives-windows", "natives-macos").forEach { + listOf("natives-linux", "natives-windows", "natives-macos", "natives-macos-arm64").forEach { natives("org.lwjgl:lwjgl::$it") natives("org.lwjgl:lwjgl-assimp::$it") natives("org.lwjgl:lwjgl-glfw::$it") diff --git a/engine/build.gradle b/engine/build.gradle index 3988c6d2831..83b17acbb1c 100644 --- a/engine/build.gradle +++ b/engine/build.gradle @@ -74,7 +74,7 @@ dependencies { api("com.google.code.gson:gson:2.8.6") api("net.sf.trove4j:trove4j:3.0.3") implementation("io.netty:netty-all:4.1.77.Final") - implementation("com.google.protobuf:protobuf-java:3.16.1") + implementation("com.google.protobuf:protobuf-java:3.22.0") implementation("org.lz4:lz4-java:1.8.0") implementation("org.apache.httpcomponents:httpclient:4.5.13") // Javax for protobuf due to @Generated - needed on Java 9 or newer Javas @@ -158,7 +158,7 @@ dependencies { protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.17.0" + artifact = "com.google.protobuf:protoc:3.22.0" } plugins { }