Skip to content

Mo/feat/v10/add shared kmp and jvm module #1795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
typfel wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Mo/feat/v10/add shared kmp and jvm module #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
52a04bc
feat: Add shared KMP and JVM module
MohamadJaara Dec 19, 2025
16e721e
feat: Add KMP module
MohamadJaara Dec 19, 2025
2b7b61b
test: move kotlin tests to the shared module
typfel Jan 27, 2026
485b8b6
ci: run kmp jvm tests on CI
typfel Jan 28, 2026
5820f20
ci: move kotlin file definitions to the top so that they are availabl…
typfel Feb 4, 2026
3fffbb0
fix(interop): align gradle version in interop and bindings to both us…
typfel Feb 4, 2026
18b4668
fix(interop): align kotlin version in interop and bindings to both us…
typfel Feb 4, 2026
77ff52f
chore(interop): stop using compose activity
typfel Feb 4, 2026
4b6ac57
fix(interop): improve NDK setup by validating ANDROID_HOME and adding…
MohamadJaara Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/interop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,19 @@ jobs:
uses: gradle/actions/setup-gradle@v5
- name: validate gradle wrapper
uses: gradle/actions/wrapper-validation@v5
- name: Setup Android SDK
- name: Setup Android SDK & NDK
uses: android-actions/setup-android@v3
- name: set ndk_home
run: |
ndk_version=$(cat crypto-ffi/bindings/android/ndk.version)
ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$ndk_version"
echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" >> $GITHUB_ENV
echo "ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> $GITHUB_ENV
if [ ! -d "$ANDROID_NDK_HOME" ]; then
echo "::warning file=.github/workflows/interop.yml,title=ANDROID_NDK_HOME does not exist::$ANDROID_NDK_HOME is not a directory"
echo "::warning file=.github/workflows/interop.yml,title=ANDROID_NDK_HOME does not exist::Installing NDK $ndk_version to $ANDROID_NDK_HOME"
yes | sdkmanager "ndk;$ndk_version"
fi
yes | sdkmanager "ndk;$ndk_version"
- name: setup Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,15 @@ jobs:
- build-jvm-linux
uses: ./.github/workflows/docs-jvm.yml

#################
# KMP

test-kmp:
needs:
- build-jvm-linux
- build-jvm-darwin
uses: ./.github/workflows/test-kmp.yml

#################
# iOS/Swift

Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/test-kmp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
concurrency:
group: "${{ github.workflow }}-${{ github.ref }}-test-kmp-jvm"
cancel-in-progress: true

on:
workflow_call:
workflow_dispatch:

env:
RELEASE: 1

jobs:
test-jvm:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v6
- name: set up jdk 17
uses: actions/setup-java@v5
with:
java-version: "17"
distribution: "adopt"
- name: gradle setup
uses: gradle/actions/setup-gradle@v5
- name: validate gradle wrapper
uses: gradle/actions/wrapper-validation@v5

- name: download linux library
uses: ./.github/actions/make/jvm
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}

# The specific jvm action uses `uname -s` to determine which `jvm` make rule to call.
# Because this workflow runs on ubuntu, we're using the generic action
- name: download aarch64 apple darwin artifact
uses: ./.github/actions/make
with:
key: jvm-darwin
make-rule: jvm-darwin
target-path: target/aarch64-apple-darwin/release/libcore_crypto_ffi.dylib
gh-token: ${{ secrets.GITHUB_TOKEN }}

- name: build and test kmp package
uses: ./.github/actions/make
with:
key: kmp-jvm-test
make-rule: kmp-jvm-test
always-run: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'main' }}
gh-token: ${{ secrets.GITHUB_TOKEN }}
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,3 +219,6 @@ dist

# Make stampfile directory for timestamp comparisons
.stamps

crypto-ffi/bindings/build
interop/src/clients/build
30 changes: 23 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@ RUST_SOURCES := $(WORKSPACE_CARGO_FILES) $(CRATE_MANIFESTS) $(RUST_RS_FILES)
hash=$$(sha256sum $($*-deps) | sha256sum | awk '{print $$1}'); \
echo "$$hash"

#-------------------------------------------------------------------------------
# Kotlin file-based heuristics
#-------------------------------------------------------------------------------

KT_WRAPPER = ./crypto-ffi/bindings/shared/src/commonMain/kotlin
KT_TESTS = ./crypto-ffi/bindings/shared/src/commonTest
KT_INTEROP = ./interop/src/clients/android-interop/src/main/java
KT_FILES := $(shell find $(KT_WRAPPER) $(KT_TESTS) $(KT_INTEROP) -type f -name '*.kt')

#-------------------------------------------------------------------------------
# Build FFI artifacts
#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -436,6 +445,17 @@ $(STAMPS)/jvm-test: $(jvm-test-deps)
./gradlew jvm:test --rerun
$(TOUCH_STAMP)

#-------------------------------------------------------------------------------
# KMP (Kotlin Multiplatform) builds
#-------------------------------------------------------------------------------

kmp-jvm-test-deps := $(KT_FILES)

$(STAMPS)/kmp-jvm-test: $(kmp-jvm-test-deps)
cd crypto-ffi/bindings && \
./gradlew kmp:jvmTest --rerun
$(TOUCH_STAMP)

#-------------------------------------------------------------------------------
# TypeScript / JS tasks
#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -592,7 +612,7 @@ $(STAMPS)/docs-rust-wasm: $(RUST_SOURCES)
docs-rust-wasm: $(STAMPS)/docs-rust-wasm ## Generate Rust docs for wasm32-unknown-unknown

# Kotlin docs
KOTLIN_SOURCES := $(shell find crypto-ffi/bindings/jvm/src/main/kotlin \
KOTLIN_SOURCES := $(shell find crypto-ffi/bindings/shared/src/commonMain/kotlin \
-type f -name '*.kt' 2>/dev/null | LC_ALL=C sort)
DOCS_KOTLIN := target/kotlin/doc/html/index.html
$(DOCS_KOTLIN): $(JVM_LIB) $(KOTLIN_SOURCES)
Expand Down Expand Up @@ -699,11 +719,6 @@ swift-check: $(STAMPS)/swift-check ## Lint Swift files via swift-format and swif

# Kotlin

KT_WRAPPER = ./crypto-ffi/bindings/jvm/src/main/kotlin
KT_TESTS = ./crypto-ffi/bindings/jvm/src/test
KT_INTEROP = ./interop/src/clients/android-interop/src/main/java
KT_FILES := $(shell find $(KT_WRAPPER) $(KT_TESTS) $(KT_INTEROP) -type f -name '*.kt')

$(STAMPS)/kotlin-fmt: $(KT_FILES)
ktlint --format $(KT_WRAPPER) $(KT_TESTS) $(KT_INTEROP)
$(TOUCH_STAMP)
Expand Down Expand Up @@ -746,9 +761,10 @@ check: rust-check swift-check kotlin-check ts-check ## Run all linters
# Lazy targets
#-------------------------------------------------------------------------------

LAZY_TARGETS := jvm-test ts-test android-test ios-test interop-test
LAZY_TARGETS := jvm-test kmp-jvm-test ts-test android-test ios-test interop-test

ts-test: ## Run TypeScript wrapper tests via wdio and bun. Optionally pass TEST=<test> to filter by test name.
kmp-jvm-test: ## Run Kotlin multi-platform tests on JVM
jvm-test: ## Run Kotlin tests on JVM
android-test: ## Run Kotlin tests on Android
ios-test: ## Run Swift tests on iOS (macOS only)
Expand Down
7 changes: 4 additions & 3 deletions crypto-ffi/bindings/android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ plugins {
id("com.vanniktech.maven.publish.base")
}

val jvmSources = projectDir.resolve("../jvm/src")
val sharedSources = projectDir.resolve("../shared/src/commonMain")
val sharedTestSources = projectDir.resolve("../shared/src/commonTest")

val dokkaHtmlJar = tasks.register<Jar>("dokkaHtmlJar") {
dependsOn(tasks.dokkaGeneratePublicationHtml)
Expand Down Expand Up @@ -87,12 +88,12 @@ android {
main {
kotlin {
srcDir(projectDir.resolve("src/main/uniffi"))
srcDir(jvmSources.resolve("main/kotlin"))
srcDir(sharedSources.resolve("kotlin"))
}
}
androidTest {
kotlin {
srcDir(jvmSources.resolve("test"))
srcDir(sharedTestSources.resolve("kotlin"))
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion crypto-ffi/bindings/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,21 @@ sdk-compile = "35"
sdk-min = "26"
gradle = "8.8"
vanniktech-publish = "0.34.0"
kotlin-gradle = "1.9.21"
kotlin-gradle = "2.0.21"
dokka = "2.0.0"
detekt = "1.23.8"
agp = "8.12.3"
gobley = "0.3.7"

[plugins]
android-library = { id = "com.android.library", version.ref = "agp" }
vanniktech-publish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-publish" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
gobley-cargo = { id = "dev.gobley.cargo", version.ref = "gobley" }
gobley-uniffi = { id = "dev.gobley.uniffi", version.ref = "gobley" }
gobley-rust = { id = "dev.gobley.rust", version.ref = "gobley" }
kotlin-atomicfu = { id = "org.jetbrains.kotlin.plugin.atomicfu", version.ref = "kotlin" }

[libraries]
coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version.ref = "coroutines" }
Expand Down
10 changes: 9 additions & 1 deletion crypto-ffi/bindings/jvm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ kotlin {
jvmToolchain(17)
}

val sharedSources = projectDir.resolve("../shared/src/commonMain")
val sharedTestSources = projectDir.resolve("../shared/src/commonTest")

dependencies {
implementation(platform(kotlin("bom")))
implementation(platform(libs.coroutines.bom))
Expand Down Expand Up @@ -61,13 +64,18 @@ tasks.named("compileKotlin") {
sourceSets {
main {
kotlin {
srcDir(projectDir.resolve("src/main/kotlin"))
srcDir(sharedSources.resolve("kotlin"))
srcDir(projectDir.resolve("src/main/uniffi"))
}
resources {
srcDirs(ffiLibsBase.resolve(buildType))
}
}
test {
kotlin {
srcDir(sharedTestSources.resolve("kotlin"))
}
}
}

// Allows skipping signing jars published to 'MavenLocal' repository
Expand Down
5 changes: 0 additions & 5 deletions crypto-ffi/bindings/jvm/src/main/kotlin/com/wire/crypto/ByteUtils.kt
View file
Open in desktop

This file was deleted.

Loading
Loading