Skip to content

Commit 6609752

Browse files
committed
chore: change bindings package
Signed-off-by: Magyari Sandor Szilard <[email protected]>
1 parent f05a49a commit 6609752

File tree

8 files changed

+22
-11
lines changed

8 files changed

+22
-11
lines changed

data-plane/bindings/kotlin/README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ This package provides Kotlin bindings for SLIM, enabling secure messaging with:
2323
```
2424
kotlin/
2525
├── Taskfile.yaml # Build automation tasks
26+
├── uniffi.toml # UniFFI configuration (package name)
27+
├── patch-bindings.sh # Post-generation patches
2628
├── build.gradle.kts # Gradle build configuration
2729
├── settings.gradle.kts # Gradle settings
2830
├── gradle.properties # Build properties
@@ -35,6 +37,8 @@ kotlin/
3537
│ ├── Group.kt # Group messaging example
3638
│ └── Server.kt # SLIM server example
3739
└── generated/ # UniFFI-generated code (gitignored)
40+
└── io/agntcy/slim/bindings/
41+
└── slim_bindings.kt
3842
```
3943

4044
## Quick Start
@@ -49,8 +53,9 @@ task generate
4953

5054
This will:
5155
1. Build the Rust `slim_bindings` library
52-
2. Run `uniffi-bindgen` to generate Kotlin code
53-
3. Copy the native library to `generated/jniLibs/`
56+
2. Run `uniffi-bindgen` with `uniffi.toml` config to generate Kotlin code in the `io.agntcy.slim.bindings` package
57+
3. Apply compatibility patches (exception message parameters, wait() method conflicts)
58+
4. Copy the native library to `generated/jniLibs/`
5459

5560
### 2. Build Examples
5661

@@ -119,7 +124,7 @@ task example:group:client-2
119124

120125
```kotlin
121126
import io.agntcy.slim.examples.common.*
122-
import uniffi.slim_bindings.*
127+
import io.agntcy.slim.bindings.*
123128
import kotlinx.coroutines.*
124129

125130
suspend fun main() = coroutineScope {

data-plane/bindings/kotlin/Taskfile.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ tasks:
5757
- which uniffi-bindgen
5858
cmds:
5959
- echo "📦 Installing uniffi-bindgen..."
60-
- cargo install uniffi-bindgen --git https://github.com/mozilla/uniffi-rs.git --tag v0.28.3
60+
- cargo install uniffi-bindgen-cli --git https://github.com/mozilla/uniffi-rs.git --tag v0.28.3
6161
- echo "✅ uniffi-bindgen installed"
6262

6363
generate:
@@ -73,6 +73,7 @@ tasks:
7373
uniffi-bindgen generate \
7474
--library '{{.LIB_PATH}}' \
7575
--language kotlin \
76+
--config uniffi.toml \
7677
--out-dir generated
7778
- task: copy-library
7879
- task: patch-bindings
@@ -171,7 +172,7 @@ tasks:
171172
vars:
172173
EXTRA_ARGS: '{{.EXTRA_ARGS | default ""}}'
173174

174-
examples:p2p:bob:
175+
examples:p2p:no-mls:bob:
175176
desc: "Point to Point example - Bob sends unencrypted messages to Alice"
176177
deps:
177178
- build

data-plane/bindings/kotlin/examples/kotlin/Group.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package io.agntcy.slim.examples
55

66
import io.agntcy.slim.examples.common.*
7-
import uniffi.slim_bindings.*
7+
import io.agntcy.slim.bindings.*
88
import kotlinx.coroutines.*
99
import java.time.Duration
1010
import java.util.concurrent.atomic.AtomicReference

data-plane/bindings/kotlin/examples/kotlin/PointToPoint.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package io.agntcy.slim.examples
55

66
import io.agntcy.slim.examples.common.*
7-
import uniffi.slim_bindings.*
7+
import io.agntcy.slim.bindings.*
88
import kotlinx.coroutines.*
99
import java.time.Duration
1010

data-plane/bindings/kotlin/examples/kotlin/Server.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package io.agntcy.slim.examples
66
import io.agntcy.slim.examples.common.ServerConfig
77
import io.agntcy.slim.examples.common.ConfigParser
88
import io.agntcy.slim.examples.common.setupService
9-
import uniffi.slim_bindings.*
9+
import io.agntcy.slim.bindings.*
1010
import kotlinx.coroutines.*
1111

1212
/**

data-plane/bindings/kotlin/examples/kotlin/common/Common.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
package io.agntcy.slim.examples.common
55

6-
import uniffi.slim_bindings.*
6+
import io.agntcy.slim.bindings.*
77
import java.io.File
88
import java.time.Duration
99
import kotlinx.coroutines.*

data-plane/bindings/kotlin/patch-bindings.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44
# patch-bindings.sh
55
# Patches UniFFI-generated Kotlin bindings to fix compatibility issues
66

7-
BINDINGS_FILE="generated/uniffi/slim_bindings/slim_bindings.kt"
7+
BINDINGS_FILE="generated/io/agntcy/slim/bindings/slim_bindings.kt"
88

99
echo "🔧 Patching generated Kotlin bindings..."
1010

@@ -40,4 +40,4 @@ sed -i.bak \
4040

4141
rm -f "$BINDINGS_FILE.bak"
4242

43-
echo "✅ Successfully patched exception message parameters and wait() methods"
43+
echo "✅ Successfully patched exception message parameters and wait() methods"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# UniFFI Configuration for Kotlin Bindings
2+
# See: https://mozilla.github.io/uniffi-rs/latest/kotlin/configuration.html
3+
4+
[bindings.kotlin]
5+
package_name = "io.agntcy.slim.bindings"

0 commit comments

Comments
 (0)