Drop kable-exceptions module and remove unused exceptions

JuulLabs · Oct 6, 2024 · 9d87037 · 9d87037
1 parent 96f0243
commit 9d87037
Show file tree

Hide file tree

Showing 13 changed files with 110 additions and 116 deletions.
diff --git a/kable-core/api/android/kable-core.api b/kable-core/api/android/kable-core.api
@@ -108,6 +108,12 @@ public final class com/juul/kable/Characteristic$Properties {
 	public final synthetic fun unbox-impl ()I
 }
 
+public final class com/juul/kable/ConnectionRejectedException : java/io/IOException {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
 public abstract interface class com/juul/kable/Descriptor {
 	public abstract fun getCharacteristicUuid ()Ljava/util/UUID;
 	public abstract fun getDescriptorUuid ()Ljava/util/UUID;
@@ -232,6 +238,12 @@ public class com/juul/kable/GattRequestRejectedException : java/lang/IllegalStat
 	public fun <init> ()V
 }
 
+public final class com/juul/kable/GattStatusException : java/io/IOException {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
 public final class com/juul/kable/GattWriteException : com/juul/kable/GattRequestRejectedException {
 	public final fun getResult ()Lcom/juul/kable/AndroidPeripheral$WriteResult;
 }
@@ -240,6 +252,9 @@ public final class com/juul/kable/IdentifierKt {
 	public static final fun toIdentifier (Ljava/lang/String;)Ljava/lang/String;
 }
 
+public final class com/juul/kable/InternalException : java/lang/IllegalStateException {
+}
+
 public final class com/juul/kable/Kable {
 	public static final field INSTANCE Lcom/juul/kable/Kable;
 }
@@ -284,6 +299,12 @@ public final class com/juul/kable/ManufacturerData {
 	public final fun getData ()[B
 }
 
+public class com/juul/kable/NotConnectedException : java/io/IOException {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
 public final class com/juul/kable/ObservationExceptionPeripheral {
 	public final fun getState ()Lkotlinx/coroutines/flow/StateFlow;
 }
@@ -562,6 +583,18 @@ public final class com/juul/kable/Transport : java/lang/Enum {
 	public static fun values ()[Lcom/juul/kable/Transport;
 }
 
+public final class com/juul/kable/UnmetRequirementException : java/io/IOException {
+	public final fun getReason ()Lcom/juul/kable/UnmetRequirementReason;
+}
+
+public final class com/juul/kable/UnmetRequirementReason : java/lang/Enum {
+	public static final field BluetoothDisabled Lcom/juul/kable/UnmetRequirementReason;
+	public static final field LocationServicesDisabled Lcom/juul/kable/UnmetRequirementReason;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Lcom/juul/kable/UnmetRequirementReason;
+	public static fun values ()[Lcom/juul/kable/UnmetRequirementReason;
+}
+
 public final class com/juul/kable/WriteType : java/lang/Enum {
 	public static final field WithResponse Lcom/juul/kable/WriteType;
 	public static final field WithoutResponse Lcom/juul/kable/WriteType;

diff --git a/kable-core/api/jvm/kable-core.api b/kable-core/api/jvm/kable-core.api
@@ -63,6 +63,12 @@ public final class com/juul/kable/Characteristic$Properties {
 	public final synthetic fun unbox-impl ()I
 }
 
+public final class com/juul/kable/ConnectionRejectedException : java/io/IOException {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
 public abstract interface class com/juul/kable/Descriptor {
 	public abstract fun getCharacteristicUuid ()Ljava/util/UUID;
 	public abstract fun getDescriptorUuid ()Ljava/util/UUID;
@@ -169,10 +175,19 @@ public final class com/juul/kable/FiltersBuilder {
 	public final fun match (Lkotlin/jvm/functions/Function1;)V
 }
 
+public final class com/juul/kable/GattStatusException : java/io/IOException {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
 public final class com/juul/kable/IdentifierKt {
 	public static final fun toIdentifier (Ljava/lang/String;)Ljava/lang/String;
 }
 
+public final class com/juul/kable/InternalException : java/lang/IllegalStateException {
+}
+
 public final class com/juul/kable/LazyCharacteristic : com/juul/kable/Characteristic {
 	public final fun component1 ()Ljava/util/UUID;
 	public final fun component2 ()Ljava/util/UUID;
@@ -206,6 +221,12 @@ public final class com/juul/kable/ManufacturerData {
 	public final fun getData ()[B
 }
 
+public class com/juul/kable/NotConnectedException : java/io/IOException {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
 public final class com/juul/kable/ObservationExceptionPeripheral {
 	public final fun getState ()Lkotlinx/coroutines/flow/StateFlow;
 }
@@ -396,6 +417,18 @@ public final class com/juul/kable/State$Disconnecting : com/juul/kable/State {
 	public static final field INSTANCE Lcom/juul/kable/State$Disconnecting;
 }
 
+public final class com/juul/kable/UnmetRequirementException : java/io/IOException {
+	public final fun getReason ()Lcom/juul/kable/UnmetRequirementReason;
+}
+
+public final class com/juul/kable/UnmetRequirementReason : java/lang/Enum {
+	public static final field BluetoothDisabled Lcom/juul/kable/UnmetRequirementReason;
+	public static final field LocationServicesDisabled Lcom/juul/kable/UnmetRequirementReason;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Lcom/juul/kable/UnmetRequirementReason;
+	public static fun values ()[Lcom/juul/kable/UnmetRequirementReason;
+}
+
 public final class com/juul/kable/WriteType : java/lang/Enum {
 	public static final field WithResponse Lcom/juul/kable/WriteType;
 	public static final field WithoutResponse Lcom/juul/kable/WriteType;

diff --git a/kable-core/build.gradle.kts b/kable-core/build.gradle.kts
@@ -25,8 +25,8 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             api(libs.kotlinx.coroutines.core)
+            api(libs.kotlinx.io)
             api(libs.uuid)
-            api(project(":kable-exceptions"))
             implementation(libs.datetime)
             implementation(libs.tuulbox.collections)
         }

diff --git a/...ommonMain/kotlin/Exceptions.deprecated.kt → ...ommonMain/kotlin/Exceptions.deprecated.kt b/...ommonMain/kotlin/Exceptions.deprecated.kt → ...ommonMain/kotlin/Exceptions.deprecated.kt
@@ -1,5 +1,17 @@
 package com.juul.kable
 
+@Deprecated(
+    message = "BluetoothException was removed. Closest replacement is UnmetRequirementException.",
+    replaceWith = ReplaceWith("UnmetRequirementException"),
+)
+public typealias BluetoothException = UnmetRequirementException
+
+@Deprecated(
+    message = "LocationManagerUnavailableException replaced by UnmetRequirementException w/ a `reason` of `LocationServicesDisabled`.",
+    replaceWith = ReplaceWith("UnmetRequirementException"),
+)
+public typealias LocationManagerUnavailableException = UnmetRequirementException
+
 @Deprecated(
     message = "BluetoothDisabledException replaced by UnmetRequirementException w/ a `reason` of `BluetoothDisabled`.",
     replaceWith = ReplaceWith("UnmetRequirementException"),

diff --git a/kable-core/src/commonMain/kotlin/Exceptions.kt b/kable-core/src/commonMain/kotlin/Exceptions.kt
@@ -0,0 +1,13 @@
+package com.juul.kable
+
+import kotlinx.io.IOException
+
+public class ConnectionRejectedException(
+    message: String? = null,
+    cause: Throwable? = null,
+) : IOException(message, cause)
+
+public class GattStatusException(
+    message: String? = null,
+    cause: Throwable? = null,
+) : IOException(message, cause)
diff --git a/kable-core/src/commonMain/kotlin/InternalException.kt b/kable-core/src/commonMain/kotlin/InternalException.kt
@@ -0,0 +1,9 @@
+package com.juul.kable
+
+public class InternalException internal constructor(
+    message: String,
+    cause: Throwable? = null,
+) : IllegalStateException(
+        "$message, please report issue to https://github.com/JuulLabs/kable/issues and provide logs",
+        cause,
+    )
diff --git a/kable-core/src/commonMain/kotlin/NotConnectedException.kt b/kable-core/src/commonMain/kotlin/NotConnectedException.kt
@@ -0,0 +1,8 @@
+package com.juul.kable
+
+import kotlinx.io.IOException
+
+public open class NotConnectedException(
+    message: String? = null,
+    cause: Throwable? = null,
+) : IOException(message, cause)
diff --git a/...nMain/kotlin/UnmetRequirementException.kt → ...nMain/kotlin/UnmetRequirementException.kt b/...nMain/kotlin/UnmetRequirementException.kt → ...nMain/kotlin/UnmetRequirementException.kt
@@ -14,7 +14,7 @@ public enum class UnmetRequirementReason {
     LocationServicesDisabled,
 }
 
-public open class UnmetRequirementException(
+public class UnmetRequirementException internal constructor(
     public val reason: UnmetRequirementReason,
     message: String,
     cause: Throwable? = null,

diff --git a/kable-exceptions/api/kable-exceptions.api b/kable-exceptions/api/kable-exceptions.api
diff --git a/kable-exceptions/build.gradle.kts b/kable-exceptions/build.gradle.kts
diff --git a/kable-exceptions/src/commonMain/kotlin/Exceptions.kt b/kable-exceptions/src/commonMain/kotlin/Exceptions.kt
diff --git a/kable-exceptions/src/commonMain/kotlin/InternalException.kt b/kable-exceptions/src/commonMain/kotlin/InternalException.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,6 +10,5 @@ pluginManagement {
 
 include(
     "kable-core",
-    "kable-exceptions",
     "kable-log-engine-khronicle",
 )