feat: Add preliminary support for multiplatform.

There is no impl yet outside of the JVM one.

Author: iphydf

.github/workflows/ci.yml

@@ -14,16 +14,19 @@ jobs:
   common:
     uses: TokTok/ci-tools/.github/workflows/common-ci.yml@master
 
-  docker-jvm:
+  docker:
+    strategy:
+      matrix:
+        target: [jvm, native]
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Build toxchat/jvm-toxcore-c:jvm
+      - name: Build toxchat/jvm-toxcore-c:${{ matrix.target }}
         uses: docker/build-push-action@v5
         with:
-          file: docker/jvm.Dockerfile
-          tags: toxchat/jvm-toxcore-c:jvm
+          file: docker/${{ matrix.target }}.Dockerfile
+          tags: toxchat/jvm-toxcore-c:${{ matrix.target }}
 
   ktlint:
     runs-on: ubuntu-22.04

BUILD.bazel

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

docker/build-native

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -eux
+
+cat <<EOF >native.txt
+-p
+library
+EOF
+
+find lib/src/commonMain -name '*.kt' -exec printf '{}\n-Xcommon-sources={}\n' ';' >>native.txt
+
+kotlinc-native @native.txt
+ls

docker/jvm.Dockerfile

@@ -7,6 +7,7 @@ RUN apt-get update \
  build-essential \
  ca-certificates \
  cmake \
+ curl \
  default-jdk \
  git \
  libtool \
@@ -23,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/main/cpp/ /work/jvm-toxcore-c/lib/src/main/cpp/
-COPY lib/src/main/proto/ /work/jvm-toxcore-c/lib/src/main/proto/
+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/
 RUN touch "$PWD/_install/host/.stamp" \
  && touch "$PWD/_install/host/libsodium.stamp" \
  && touch "$PWD/_install/host/libvpx.stamp" \
@@ -42,10 +43,10 @@ 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/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
+RUN javac -h . -cp /work/jvm-toxcore-c/lib/build/classes/kotlin/jvmMain:/work/jvm-toxcore-c/lib/build/classes/java/jvmMain \
+ 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

docker/native.Dockerfile

@@ -0,0 +1,33 @@
+FROM ubuntu:22.04
+
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+ autoconf \
+ automake \
+ build-essential \
+ ca-certificates \
+ cmake \
+ curl \
+ default-jdk \
+ git \
+ libtool \
+ make \
+ pkg-config \
+ yasm \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /opt
+RUN curl -L -o kotlin-native.tar.gz https://github.com/JetBrains/kotlin/releases/download/v1.9.22/kotlin-native-linux-x86_64-1.9.22.tar.gz \
+ && tar zxf kotlin-native.tar.gz \
+ && mv kotlin-native-linux-x86_64-1.9.22 kotlin \
+ && rm kotlin-native.tar.gz
+ENV PATH=$PATH:/opt/kotlin/bin
+
+RUN ["touch", "Boot.kt"]
+RUN ["kotlinc-native", "-p", "library", "Boot.kt"]
+
+WORKDIR /work/jvm-toxcore-c
+COPY lib/ /work/jvm-toxcore-c/lib/
+COPY docker/build-native /work/jvm-toxcore-c/docker/
+RUN ["docker/build-native"]

lib/build.gradle.kts

@@ -1,14 +1,5 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This generated file contains a sample Kotlin library project to get you started.
- * For more details on building Java & JVM projects, please refer to https://docs.gradle.org/8.4/userguide/building_java_projects.html in the Gradle documentation.
- * This project uses @Incubating APIs which are subject to change.
- */
-
 plugins {
-    // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
-    id("org.jetbrains.kotlin.jvm") version "1.9.22"
+    kotlin("multiplatform") version "1.9.22"
     id("com.google.protobuf") version "0.9.4"
 
     // Apply the java-library plugin for API and implementation separation.
@@ -21,10 +12,21 @@ repositories {
 }
 
 dependencies {
-    implementation("com.google.protobuf:protobuf-java:3.24.4")
     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")
+            }
+        }
+    }
+}
+
 testing {
     suites {
         // Configure the built-in test suite

lib/src/main/java/im/tox/tox4j/ToxEventListener.kt renamed to lib/src/commonMain/kotlin/im/tox/tox4j/ToxEventListener.kt

@@ -8,7 +8,6 @@ import im.tox.tox4j.av.data.SamplingRate
 import im.tox.tox4j.av.enums.ToxavCallControl
 import im.tox.tox4j.core.ToxCore
 import im.tox.tox4j.core.data.ToxFriendNumber
-import java.io.Closeable
 
 /**
  * Public audio/video API for Tox clients.
@@ -28,7 +27,8 @@ import java.io.Closeable
  * otherwise undefined behaviour occurs. Upon closing of ToxAv instance, all active calls will be
  * forcibly terminated without notifying peers.
  */
-interface ToxAv : Closeable {
+@kotlin.ExperimentalStdlibApi
+interface ToxAv : AutoCloseable {
     /**
      * Start new A/V session. There can only be only one session per Tox instance.
      *