From f8ae2f1b1b2f30e4dfdaa447e9a61b5111ffcf50 Mon Sep 17 00:00:00 2001 From: davidliu Date: Fri, 13 Feb 2026 00:40:35 +0900 Subject: [PATCH 1/6] Test for diffuse and dependency-diff --- livekit-android-sdk/build.gradle | 3 ++ .../main/java/io/livekit/android/LiveKit.kt | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/livekit-android-sdk/build.gradle b/livekit-android-sdk/build.gradle index 45a3f6981..643919773 100644 --- a/livekit-android-sdk/build.gradle +++ b/livekit-android-sdk/build.gradle @@ -140,6 +140,9 @@ dokkaHtml { } dependencies { + // For testing diffuse/dependency-diff + implementation 'com.conena.nanokt:nanokt:1.3.0' + //api fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation libs.coroutines.lib diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt b/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt index 28c73083a..c36b73a7e 100644 --- a/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt +++ b/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt @@ -18,6 +18,8 @@ package io.livekit.android import android.app.Application import android.content.Context +import com.conena.nanokt.ternary +import io.livekit.android.LiveKit.loggingLevel import io.livekit.android.dagger.DaggerLiveKitComponent import io.livekit.android.dagger.RTCModule import io.livekit.android.dagger.create @@ -95,4 +97,33 @@ object LiveKit { return room } + + /** + * A new api for diffuse + */ + fun newApi(someBool: Boolean): Boolean { + return someBool.ternary(ifTrue = true, ifFalse = false) + } + + /** + * This is a suppressed api. + * @suppress + */ + fun suppressedApi(): String { + return "suppressed" + } + + /** + * This is an internal api. + */ + internal fun internalApi(): String { + return "suppressed" + } + + /** + * This is a private api. + */ + private fun privateApi(): String { + return "suppressed" + } } From 1d4f84bbe6e796d7dcec3c6db069bd01478ad835 Mon Sep 17 00:00:00 2001 From: davidliu Date: Fri, 13 Feb 2026 00:46:47 +0900 Subject: [PATCH 2/6] spotles --- livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt b/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt index c36b73a7e..436512b93 100644 --- a/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt +++ b/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 LiveKit, Inc. + * Copyright 2023-2026 LiveKit, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 4d3d92a60053eaecaa4012dbb15a7f8e6ad48763 Mon Sep 17 00:00:00 2001 From: davidliu Date: Fri, 13 Feb 2026 01:02:28 +0900 Subject: [PATCH 3/6] use guava for the test --- livekit-android-sdk/build.gradle | 2 +- .../src/main/java/io/livekit/android/LiveKit.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/livekit-android-sdk/build.gradle b/livekit-android-sdk/build.gradle index 643919773..a5d63e7cb 100644 --- a/livekit-android-sdk/build.gradle +++ b/livekit-android-sdk/build.gradle @@ -141,7 +141,7 @@ dokkaHtml { dependencies { // For testing diffuse/dependency-diff - implementation 'com.conena.nanokt:nanokt:1.3.0' + implementation("com.google.guava:guava:33.5.0-android") //api fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt b/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt index 436512b93..c18bfa25e 100644 --- a/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt +++ b/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt @@ -18,7 +18,7 @@ package io.livekit.android import android.app.Application import android.content.Context -import com.conena.nanokt.ternary +import com.google.common.base.Preconditions import io.livekit.android.LiveKit.loggingLevel import io.livekit.android.dagger.DaggerLiveKitComponent import io.livekit.android.dagger.RTCModule @@ -102,7 +102,8 @@ object LiveKit { * A new api for diffuse */ fun newApi(someBool: Boolean): Boolean { - return someBool.ternary(ifTrue = true, ifFalse = false) + Preconditions.checkArgument(someBool) + return true } /** From 90cb90d3f7f8ddf4ffe7f954fc896d517af644a4 Mon Sep 17 00:00:00 2001 From: davidliu Date: Fri, 13 Feb 2026 01:15:52 +0900 Subject: [PATCH 4/6] test --- gradle/libs.versions.toml | 2 +- livekit-android-sdk/build.gradle | 2 -- livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3501a8d7f..93ef51068 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -63,7 +63,7 @@ segmentation-selfie = { module = "com.google.mlkit:segmentation-selfie", version semver4j = { module = "com.vdurmont:semver4j", version.ref = "semver4j" } webrtc = { module = "io.github.webrtc-sdk:android-prefixed", version.ref = "webrtc" } -androidx-annotation = { module = "androidx.annotation:annotation", version = "1.7.1" } +androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.9.0" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version = "1.0.1" } auto-service-compiler = { module = "com.google.auto.service:auto-service", version.ref = "autoService" } diff --git a/livekit-android-sdk/build.gradle b/livekit-android-sdk/build.gradle index a5d63e7cb..040524316 100644 --- a/livekit-android-sdk/build.gradle +++ b/livekit-android-sdk/build.gradle @@ -140,8 +140,6 @@ dokkaHtml { } dependencies { - // For testing diffuse/dependency-diff - implementation("com.google.guava:guava:33.5.0-android") //api fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt b/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt index c18bfa25e..c1db3ca4e 100644 --- a/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt +++ b/livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt @@ -18,7 +18,6 @@ package io.livekit.android import android.app.Application import android.content.Context -import com.google.common.base.Preconditions import io.livekit.android.LiveKit.loggingLevel import io.livekit.android.dagger.DaggerLiveKitComponent import io.livekit.android.dagger.RTCModule @@ -102,7 +101,6 @@ object LiveKit { * A new api for diffuse */ fun newApi(someBool: Boolean): Boolean { - Preconditions.checkArgument(someBool) return true } From 7053805cb3672b7efe9b3f1104ac0ce552150870 Mon Sep 17 00:00:00 2001 From: davidliu Date: Fri, 13 Feb 2026 02:11:52 +0900 Subject: [PATCH 5/6] fix diffuse --- .github/workflows/android.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f1f85d7e1..f2fb2f6b6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -222,14 +222,19 @@ jobs: - uses: actions/cache@v4 name: Download base source file for diffuse with: - path: client-sdk-android/diffuse-source-file + path: diffuse-source-file key: diffuse-${{ github.event.pull_request.base.sha }} + - uses: actions/download-artifact@v5 + with: + name: livekit-android-sdk-release.aar + + - id: diffuse uses: usefulness/diffuse-action@v1 with: - old-file-path: client-sdk-android/diffuse-source-file - new-file-path: client-sdk-android/livekit-android-sdk/build/outputs/aar/livekit-android-sdk-release.aar + old-file-path: diffuse-source-file + new-file-path: livekit-android-sdk-release.aar # Consuming diffuse action output From c9d2fc62a9ee02748db5e0df0e5564ab816b8d7e Mon Sep 17 00:00:00 2001 From: davidliu Date: Fri, 13 Feb 2026 02:23:14 +0900 Subject: [PATCH 6/6] fix ci --- .github/workflows/android.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f2fb2f6b6..f20acc8f3 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -222,19 +222,19 @@ jobs: - uses: actions/cache@v4 name: Download base source file for diffuse with: - path: diffuse-source-file + path: client-sdk-android/diffuse-source-file key: diffuse-${{ github.event.pull_request.base.sha }} - uses: actions/download-artifact@v5 with: name: livekit-android-sdk-release.aar - + path: client-sdk-android/ - id: diffuse uses: usefulness/diffuse-action@v1 with: - old-file-path: diffuse-source-file - new-file-path: livekit-android-sdk-release.aar + old-file-path: client-sdk-android/diffuse-source-file + new-file-path: client-sdk-android/livekit-android-sdk-release.aar # Consuming diffuse action output