docs: kotlin.time.Instant dans le plan (conflit variantes kotlinx-datetime via okio)
This commit is contained in:
1 file changed
+4
-4
@@ -531,7 +531,7 @@ git commit -m "feat: types de questions et générateur (tables 1..maxTable)"
|
|||||||
```kotlin
|
```kotlin
|
||||||
package com.livrets.game
|
package com.livrets.game
|
||||||
|
|
||||||
import kotlinx.datetime.Instant
|
import kotlin.time.Instant
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
import kotlin.test.Test
|
import kotlin.test.Test
|
||||||
import kotlin.test.assertEquals
|
import kotlin.test.assertEquals
|
||||||
@@ -651,7 +651,7 @@ data class AnswerRecord(
|
|||||||
```kotlin
|
```kotlin
|
||||||
package com.livrets.game
|
package com.livrets.game
|
||||||
|
|
||||||
import kotlinx.datetime.Instant
|
import kotlin.time.Instant
|
||||||
import kotlinx.serialization.Serializable
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
@Serializable
|
@Serializable
|
||||||
@@ -1065,7 +1065,7 @@ import com.livrets.game.GameConfig
|
|||||||
import com.livrets.game.GameResult
|
import com.livrets.game.GameResult
|
||||||
import com.livrets.game.Question
|
import com.livrets.game.Question
|
||||||
import kotlinx.coroutines.test.runTest
|
import kotlinx.coroutines.test.runTest
|
||||||
import kotlinx.datetime.Instant
|
import kotlin.time.Instant
|
||||||
import okio.fakefilesystem.FakeFileSystem
|
import okio.fakefilesystem.FakeFileSystem
|
||||||
import okio.Path.Companion.toPath
|
import okio.Path.Companion.toPath
|
||||||
import kotlin.test.Test
|
import kotlin.test.Test
|
||||||
@@ -1863,7 +1863,7 @@ import com.livrets.data.HistoryRepository
|
|||||||
import com.livrets.game.GameResult
|
import com.livrets.game.GameResult
|
||||||
import com.livrets.game.TableStats
|
import com.livrets.game.TableStats
|
||||||
import com.livrets.game.tableStats
|
import com.livrets.game.tableStats
|
||||||
import kotlinx.datetime.Instant
|
import kotlin.time.Instant
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun HistoryScreen(
|
fun HistoryScreen(
|
||||||
|
|||||||
Reference in new issue
Block a user