Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix build error due to merge conflict #302

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Hotfix build error due to merge conflict #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d277311
Fix build error due to merge conflict
orkun1675 Dec 11, 2024
ce71768
Downgrade Android datastore
orkun1675 Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
2 changes: 1 addition & 1 deletion android/src/main/kotlin/com/gdelataillade/alarm/models/AlarmSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/kotlin/com/gdelataillade/alarm/models/NotificationSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
4 changes: 2 additions & 2 deletions android/src/main/kotlin/com/gdelataillade/alarm/models/VolumeSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading