chore: Switch from kmp to a normal jvm library

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
   docker:
     strategy:
       matrix:
-        target: [jvm, native]
+        target: [jvm]
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx

BUILD.bazel

@@ -16,24 +16,24 @@ genrule(
         "@platforms//os:osx": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
         "@platforms//os:windows": ["@bazel_tools//tools/jdk:jni_md_header-windows"],
     }),
-    outs = ["lib/src/jvmMain/cpp/jni_md.h"],
+    outs = ["lib/src/main/cpp/jni_md.h"],
     cmd = "cp -f $< $@",
     tags = ["java"],
 )
 
 genrule(
     name = "copy_link_jni_header",
     srcs = ["@bazel_tools//tools/jdk:jni_header"],
-    outs = ["lib/src/jvmMain/cpp/jni.h"],
+    outs = ["lib/src/main/cpp/jni.h"],
     cmd = "cp -f $< $@",
     tags = ["java"],
 )
 
 proto_library(
     name = "jni_proto",
     srcs = [
-        "lib/src/jvmMain/proto/Av.proto",
-        "lib/src/jvmMain/proto/Core.proto",
+        "lib/src/main/proto/Av.proto",
+        "lib/src/main/proto/Core.proto",
     ],
     tags = ["java"],
 )
@@ -53,27 +53,27 @@ java_proto_library(
 cc_binary(
     name = "libtox4j-c.so",
     srcs = glob([
-        "lib/src/jvmMain/cpp/**/*.cpp",
-        "lib/src/jvmMain/cpp/**/*.h",
+        "lib/src/main/cpp/**/*.cpp",
+        "lib/src/main/cpp/**/*.h",
     ]) + [
-        ":lib/src/jvmMain/cpp/jni.h",
-        ":lib/src/jvmMain/cpp/jni_md.h",
+        ":lib/src/main/cpp/jni.h",
+        ":lib/src/main/cpp/jni_md.h",
     ],
     includes = [
-        "lib/src/jvmMain/cpp",
-        "lib/src/jvmMain/proto",
+        "lib/src/main/cpp",
+        "lib/src/main/proto",
     ],
     linkopts = select({
-        "@platforms//os:freebsd": ["-Wl,--version-script,$(location lib/src/jvmMain/cpp/libtox4j-c.ld)"],
-        "@platforms//os:linux": ["-Wl,--version-script,$(location lib/src/jvmMain/cpp/libtox4j-c.ld)"],
+        "@platforms//os:freebsd": ["-Wl,--version-script,$(location lib/src/main/cpp/libtox4j-c.ld)"],
+        "@platforms//os:linux": ["-Wl,--version-script,$(location lib/src/main/cpp/libtox4j-c.ld)"],
         "@platforms//os:osx": [],
         "@platforms//os:windows": [],
     }),
     linkshared = True,
     tags = ["java"],
     visibility = ["//visibility:public"],
     deps = [
-        "lib/src/jvmMain/cpp/libtox4j-c.ld",
+        "lib/src/main/cpp/libtox4j-c.ld",
         ":jni_cc_proto",
         "//c-toxcore",
         "@libsodium",
@@ -83,8 +83,8 @@ cc_binary(
 kt_jvm_library(
     name = "jvm-toxcore-c",
     srcs = glob([
-        "lib/src/*Main/**/*.java",
-        "lib/src/*Main/**/*.kt",
+        "lib/src/main/**/*.java",
+        "lib/src/main/**/*.kt",
     ]),
     data = ["libtox4j-c.so"],
     tags = ["java"],
@@ -95,7 +95,7 @@ kt_jvm_library(
 kt_jvm_test(
     name = "ToxCoreTest",
     size = "small",
-    srcs = glob(["lib/src/jvmTest/**/*.kt"]),
+    srcs = glob(["lib/src/test/**/*.kt"]),
     jvm_flags = ["-Djava.library.path=jvm-toxcore-c"],
     tags = ["java"],
     test_class = "im.tox.tox4j.core.ToxCoreTest",

docker/jvm.Dockerfile

@@ -24,8 +24,8 @@ RUN scripts/build-host "$PWD/_install/host/protobuf.stamp" "-j$(nproc)"
 RUN scripts/build-host "$PWD/_install/host/toxcore.stamp" "-j$(nproc)"
 
 # Native code, changes less frequently.
-COPY lib/src/jvmMain/cpp/ /work/jvm-toxcore-c/lib/src/jvmMain/cpp/
-COPY lib/src/jvmMain/proto/ /work/jvm-toxcore-c/lib/src/jvmMain/proto/
+COPY lib/src/main/cpp/ /work/jvm-toxcore-c/lib/src/main/cpp/
+COPY lib/src/main/proto/ /work/jvm-toxcore-c/lib/src/main/proto/
 RUN touch "$PWD/_install/host/.stamp" \
  && touch "$PWD/_install/host/libsodium.stamp" \
  && touch "$PWD/_install/host/libvpx.stamp" \
@@ -40,13 +40,12 @@ 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 \
- lib/src/jvmMain/java/im/tox/tox4j/impl/jni/ToxAvJni.java \
- lib/src/jvmMain/java/im/tox/tox4j/impl/jni/ToxCoreJni.java \
- lib/src/jvmMain/java/im/tox/tox4j/impl/jni/ToxCryptoJni.java
-RUN diff -u lib/src/jvmMain/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h im_tox_tox4j_impl_jni_ToxCoreJni.h \
- && diff -u lib/src/jvmMain/cpp/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h im_tox_tox4j_impl_jni_ToxAvJni.h \
- && diff -u lib/src/jvmMain/cpp/ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h im_tox_tox4j_impl_jni_ToxCryptoJni.h
+RUN javac -h . -cp /work/jvm-toxcore-c/lib/build/classes/kotlin/main:/work/jvm-toxcore-c/lib/build/classes/java/main \
+ lib/src/main/java/im/tox/tox4j/impl/jni/ToxAvJni.java \
+ lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreJni.java \
+ lib/src/main/java/im/tox/tox4j/impl/jni/ToxCryptoJni.java
+RUN diff -u lib/src/main/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h im_tox_tox4j_impl_jni_ToxCoreJni.h \
+ && diff -u lib/src/main/cpp/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h im_tox_tox4j_impl_jni_ToxAvJni.h \
+ && diff -u lib/src/main/cpp/ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h im_tox_tox4j_impl_jni_ToxCryptoJni.h

lib/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("multiplatform") version "1.9.22"
+    kotlin("jvm") version "1.9.22"
     id("com.google.protobuf") version "0.9.4"
 
     // Apply the java-library plugin for API and implementation separation.
@@ -11,19 +11,16 @@ repositories {
     mavenCentral()
 }
 
+val protobufVersion = "3.24.4"
+
 dependencies {
+    implementation("com.google.protobuf:protobuf-java:$protobufVersion")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
 }
 
-kotlin {
-    jvm()
-
-    sourceSets {
-        val jvmMain by getting {
-            dependencies {
-                implementation("com.google.protobuf:protobuf-java:3.24.4")
-            }
-        }
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
 }
 

scripts/dependencies.mk

@@ -3,7 +3,7 @@ POST_RULE = ls -ld $@
 
 GIT_CLONE = git clone --depth=1 --recurse-submodules --shallow-submodules
 
-$(BUILDDIR)/tox4j/Makefile: $(CURDIR)/lib/src/jvmMain/cpp/CMakeLists.txt $(TOOLCHAIN_FILE) $(foreach i,protobuf toxcore,$(PREFIX)/$i.stamp)
+$(BUILDDIR)/tox4j/Makefile: $(CURDIR)/lib/src/main/cpp/CMakeLists.txt $(TOOLCHAIN_FILE) $(foreach i,protobuf toxcore,$(PREFIX)/$i.stamp)
 	@$(PRE_RULE)
 	mkdir -p $(@D)
 	cd $(@D) && cmake $(<D) $($(notdir $(@D))_CONFIGURE)