From d27731191e426a3527214908621dff340768c958 Mon Sep 17 00:00:00 2001 From: Orkun Duman Date: Wed, 11 Dec 2024 18:47:40 -0500 Subject: [PATCH 1/2] Fix build error due to merge conflict --- .../kotlin/com/gdelataillade/alarm/models/AlarmSettings.kt | 2 +- .../com/gdelataillade/alarm/models/NotificationSettings.kt | 2 +- .../kotlin/com/gdelataillade/alarm/models/VolumeSettings.kt | 4 ++-- 3 files changed, 4 insertions(+), 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 index 0bef863..4ba3a90 100644 --- 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 index 2834623..2e80a50 100644 --- 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 index f977bc9..39d34cf 100644 --- 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 From ce71768d570a61ea2c4ef6fd024557c0804cd2d6 Mon Sep 17 00:00:00 2001 From: Orkun Duman Date: Thu, 12 Dec 2024 01:37:35 -0500 Subject: [PATCH 2/2] Downgrade Android datastore --- android/build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index ae5a397..fa72c41 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -56,8 +56,10 @@ android { } dependencies { - implementation 'androidx.datastore:datastore:1.1.1' - implementation 'androidx.datastore:datastore-preferences:1.1.1' + //noinspection v1.1.1 has a bug that prevents native_debug_symbol generation + // see: https://issuetracker.google.com/u/0/issues/342671895 + implementation 'androidx.datastore:datastore:1.0.0' + implementation 'androidx.datastore:datastore-preferences:1.0.0' //noinspection GradleDependency: 1.7+ requires Kotlin 2 implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3' } \ No newline at end of file