diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 131396911..c85f3fb84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,15 @@ jobs: with: distribution: temurin java-version: 11 - + + - uses: nttld/setup-ndk@v1 + id: setup-ndk + with: + ndk-version: r26 + add-to-path: false +# local-cache: true + link-to-sdk: true + - name: Install Rust uses: actions-rs/toolchain@v1 with: @@ -53,9 +61,5 @@ jobs: working-directory: zenoh-jni run: cargo build --verbose - - name: Cargo Test - working-directory: zenoh-jni - run: cargo test --verbose -- --nocapture - - name: Gradle Test - run: gradle jvmTest + run: gradle jvmTest --info diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1eb384188..364bcd88b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,6 +27,13 @@ jobs: distribution: temurin java-version: 11 + - uses: nttld/setup-ndk@v1 + id: setup-ndk + with: + ndk-version: r26 + add-to-path: false + link-to-sdk: true + - name: Install Rust uses: actions-rs/toolchain@v1 with: @@ -48,12 +55,8 @@ jobs: working-directory: zenoh-jni run: cargo build --verbose - - name: Cargo Test - working-directory: zenoh-jni - run: cargo test --verbose -- --nocapture - - name: Gradle Test - run: gradle jvmTest + run: gradle jvmTest --info build_doc_and_deploy: name: Build and Deploy Documentation diff --git a/README.md b/README.md index ddadc4883..be9688ad6 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,7 @@ Basically: * Rust ([Installation guide](https://doc.rust-lang.org/cargo/getting-started/installation.html)) * Kotlin ([Installation guide](https://kotlinlang.org/docs/getting-started.html#backend)) * Gradle ([Installation guide](https://gradle.org/install/)) +* Android SDK ([Installation guide](https://developer.android.com/about/versions/11/setup-sdk)) ## Android Android @@ -115,7 +116,7 @@ And finally, do not forget to add the required internet permissions on your mani And that was it! You can now import the code from the `io.zenoh` package and use it at your will. -## JVM +## JVM JVM To publish a library for a JVM project into Maven local, run diff --git a/jvm.png b/jvm.png new file mode 100644 index 000000000..07f1b123c Binary files /dev/null and b/jvm.png differ diff --git a/zenoh-kotlin/build.gradle.kts b/zenoh-kotlin/build.gradle.kts index e9fa794d9..61812e2d3 100644 --- a/zenoh-kotlin/build.gradle.kts +++ b/zenoh-kotlin/build.gradle.kts @@ -28,6 +28,8 @@ android { namespace = "io.zenoh" compileSdk = 30 + ndkVersion = "26.0.10792818" + defaultConfig { minSdk = 30 }