Fix build error due to merge conflict

gdelataillade · Dec 11, 2024 · d277311 · d277311
1 parent be4ab2e
commit d277311
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/android/src/main/kotlin/com/gdelataillade/alarm/models/AlarmSettings.kt b/android/src/main/kotlin/com/gdelataillade/alarm/models/AlarmSettings.kt
@@ -1,7 +1,7 @@
 package com.gdelataillade.alarm.models
 
 import com.gdelataillade.alarm.generated.AlarmSettingsWire
-import com.google.gson.*
+import kotlinx.serialization.KSerializer
 import java.util.Date
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.descriptors.PrimitiveKind

diff --git a/android/src/main/kotlin/com/gdelataillade/alarm/models/NotificationSettings.kt b/android/src/main/kotlin/com/gdelataillade/alarm/models/NotificationSettings.kt
@@ -1,7 +1,7 @@
 package com.gdelataillade.alarm.models
 
 import com.gdelataillade.alarm.generated.NotificationSettingsWire
-import com.google.gson.Gson
+import kotlinx.serialization.Serializable
 
 @Serializable
 data class NotificationSettings(

diff --git a/android/src/main/kotlin/com/gdelataillade/alarm/models/VolumeSettings.kt b/android/src/main/kotlin/com/gdelataillade/alarm/models/VolumeSettings.kt
@@ -1,7 +1,7 @@
 package com.gdelataillade.alarm.models
 
-import VolumeFadeStepWire
-import VolumeSettingsWire
+import com.gdelataillade.alarm.generated.VolumeFadeStepWire
+import com.gdelataillade.alarm.generated.VolumeSettingsWire
 import kotlinx.serialization.Serializable
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds