Simplify service filter creation in common code (#235)

Author: twyatt

README.md

@@ -62,7 +62,7 @@ Scan results can be filtered by manufacturer data using the same ID, data, and d
 ```kotlin
 val scanner = Scanner {
     filters = listOf(
-        Filter.ManufacturerData(manufacturerID = 1, data = byteArrayOf(), dataMask = byteArrayOf())
+        Filter.ManufacturerData(id = 1, data = byteArrayOf(), dataMask = byteArrayOf())
     )
 }
 ``` 

core/api/core.api

@@ -258,6 +258,7 @@ public final class com/juul/kable/ScannerKt {
 	public static final fun Scanner (Ljava/util/List;)Lcom/juul/kable/Scanner;
 	public static final fun Scanner (Lkotlin/jvm/functions/Function1;)Lcom/juul/kable/Scanner;
 	public static synthetic fun Scanner$default (Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/juul/kable/Scanner;
+	public static final fun scannerWithFilters (Ljava/util/List;)Lcom/juul/kable/Scanner;
 }
 
 public abstract interface class com/juul/kable/Service {

core/src/androidMain/kotlin/Filter.kt

@@ -20,7 +20,7 @@ public actual sealed class Filter {
         public val dataMask: ByteArray?
     ) : Filter()
 
-    public actual class Service(
+    public actual class Service actual constructor(
         public actual val uuid: Uuid
     ) : Filter()
 }

core/src/appleMain/kotlin/Filter.kt

@@ -4,7 +4,7 @@ import com.benasher44.uuid.Uuid
 
 public actual sealed class Filter {
 
-    public actual class Service(
+    public actual class Service actual constructor(
         public actual val uuid: Uuid
     ) : Filter()
 }

core/src/commonMain/kotlin/Filter.kt

@@ -4,7 +4,7 @@ import com.benasher44.uuid.Uuid
 
 public expect sealed class Filter {
 
-    public class Service : Filter {
+    public class Service constructor(uuid: Uuid) : Filter {
         public val uuid: Uuid
     }
 }

core/src/commonMain/kotlin/Scanner.kt

@@ -1,17 +1,27 @@
 package com.juul.kable
 
+import com.benasher44.uuid.Uuid
 import kotlinx.coroutines.flow.Flow
+import kotlin.jvm.JvmName
 
 public interface Scanner {
     public val advertisements: Flow<Advertisement>
 }
 
 @Deprecated(
     message = "Replaced with ScannerBuilder DSL",
-    replaceWith = ReplaceWith("Scanner { this.services = services }"),
+    replaceWith = ReplaceWith("Scanner { filters = services?.map { Filter.Service(it) } }"),
 )
+public fun Scanner(services: List<Uuid>?): Scanner =
+    Scanner { filters = services?.map { Filter.Service(it) } }
+
+@Deprecated(
+    message = "Replaced with ScannerBuilder DSL",
+    replaceWith = ReplaceWith("Scanner { this.filters = filters }"),
+)
+@JvmName("scannerWithFilters")
 public fun Scanner(filters: List<Filter>?): Scanner =
-    ScannerBuilder().apply { this.filters = filters }.build()
+    Scanner { this.filters = filters }
 
 public fun Scanner(
     builderAction: ScannerBuilder.() -> Unit = {},

core/src/jsMain/kotlin/Filter.kt

@@ -4,7 +4,7 @@ import com.benasher44.uuid.Uuid
 
 public actual sealed class Filter {
 
-    public actual class Service(
+    public actual class Service actual constructor(
         public actual val uuid: Uuid
     ) : Filter()
 }