fix: Match the protoc version w/ the protobuf in the gradle build

Not specifying a protoc binary like this means it uses what's installed on the system.
TokTok · Jan 1, 2025 · 948ffe4 · 948ffe4
1 parent c6e12e2
commit 948ffe4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/docker/jvm.Dockerfile b/docker/jvm.Dockerfile
@@ -39,8 +39,6 @@ RUN ["ls", "-lh", "/work/jvm-toxcore-c/_install/host/lib/libtox4j-c.so"]
 COPY gradlew gradle.properties settings.gradle.kts /work/jvm-toxcore-c/
 COPY gradle /work/jvm-toxcore-c/gradle/
 COPY lib/ /work/jvm-toxcore-c/lib/
-ENV LD_LIBRARY_PATH=/work/jvm-toxcore-c/_install/host/lib
-ENV PATH=/work/jvm-toxcore-c/_install/host/bin:$PATH
 RUN ./gradlew build
 
 RUN javac -h . -cp /work/jvm-toxcore-c/lib/build/classes/kotlin/jvm/main:/work/jvm-toxcore-c/lib/build/classes/java/jvm/main \

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -11,11 +11,19 @@ repositories {
     mavenCentral()
 }
 
+val protobufVersion = "3.24.4"
+
 dependencies {
-    implementation("com.google.protobuf:protobuf-java:3.24.4")
+    implementation("com.google.protobuf:protobuf-java:$protobufVersion")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
 }
 
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
+    }
+}
+
 testing {
     suites {
         // Configure the built-in test suite