Use jso from kotlin-wrappers library (#726)

JuulLabs · Aug 7, 2024 · 50157a4 · 50157a4
1 parent 6490a4d
commit 50157a4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,6 +18,8 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t
 tuulbox-collections = { module = "com.juul.tuulbox:collections", version.ref = "tuulbox" }
 tuulbox-coroutines = { module = "com.juul.tuulbox:coroutines", version.ref = "tuulbox" }
 uuid = { module = "com.benasher44:uuid", version = "0.8.4" }
+wrappers-bom = { module = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom", version = "1.0.0-pre.781" }
+wrappers-web = { module = "org.jetbrains.kotlin-wrappers:kotlin-web" }
 
 [plugins]
 android-library = { id = "com.android.library", version = "8.5.1" }

diff --git a/kable-core/build.gradle.kts b/kable-core/build.gradle.kts
@@ -47,6 +47,11 @@ kotlin {
 
             implementation(libs.tuulbox.coroutines)
         }
+
+        jsMain.dependencies {
+            api(libs.wrappers.web)
+            api(project.dependencies.platform(libs.wrappers.bom))
+        }
     }
 }
 

diff --git a/kable-core/src/jsMain/kotlin/Bluetooth.kt b/kable-core/src/jsMain/kotlin/Bluetooth.kt
@@ -8,6 +8,7 @@ import com.juul.kable.external.BluetoothAvailabilityChanged
 import com.juul.kable.external.BluetoothLEScanFilterInit
 import com.juul.kable.external.BluetoothServiceUUID
 import com.juul.kable.external.RequestDeviceOptions
+import js.objects.jso
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.await
 import kotlinx.coroutines.channels.awaitClose

diff --git a/kable-core/src/jsMain/kotlin/BluetoothLEScanOptions.kt b/kable-core/src/jsMain/kotlin/BluetoothLEScanOptions.kt
@@ -4,6 +4,7 @@ import com.benasher44.uuid.Uuid
 import com.juul.kable.external.BluetoothLEScanFilterInit
 import com.juul.kable.external.BluetoothLEScanOptions
 import com.juul.kable.external.BluetoothManufacturerDataFilterInit
+import js.objects.jso
 
 /** Convert list of public API type to Web Bluetooth (JavaScript) type. */
 internal fun List<FilterPredicate>.toBluetoothLEScanOptions(): BluetoothLEScanOptions = jso {

diff --git a/kable-core/src/jsMain/kotlin/FilterSet.kt b/kable-core/src/jsMain/kotlin/FilterSet.kt
@@ -3,6 +3,7 @@ package com.juul.kable
 import com.benasher44.uuid.Uuid
 import com.juul.kable.external.BluetoothLEScanFilterInit
 import com.juul.kable.external.BluetoothManufacturerDataFilterInit
+import js.objects.jso
 
 /**
  * Filtering on Service Data is not supported because it is not implemented:

diff --git a/kable-core/src/jsMain/kotlin/jso.kt b/kable-core/src/jsMain/kotlin/jso.kt