Skip to content

Commit cc8e1e3

Browse files
authored
πŸ”€ Merge pull request #24 from vinceglb/remove-datetime-dep
βž– Remove kotlinx-datetime library
2 parents 2709f5b + 0257f09 commit cc8e1e3

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

β€Žconfettikit/build.gradle.ktsβ€Ž

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ kotlin {
4848
implementation(compose.foundation)
4949
implementation(compose.ui)
5050
implementation(libs.androidx.lifecycle.runtime.compose)
51-
52-
// Kotlinx
53-
api(libs.kotlinx.datetime)
5451
}
5552
}
5653
}

β€Žconfettikit/src/commonMain/kotlin/io/github/vinceglb/confettikit/compose/ConfettiKit.ktβ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import io.github.vinceglb.confettikit.core.Party
1818
import io.github.vinceglb.confettikit.core.PartySystem
1919
import io.github.vinceglb.confettikit.core.models.CoreRect
2020
import io.github.vinceglb.confettikit.core.models.Shape
21-
import kotlinx.datetime.Clock
21+
import kotlin.time.Clock
22+
import kotlin.time.ExperimentalTime
2223

2324
@Composable
2425
public fun ConfettiKit(
@@ -129,6 +130,7 @@ internal fun storeImages(
129130
return party.copy(shapes = transformedShapes)
130131
}
131132

133+
@OptIn(ExperimentalTime::class)
132134
internal fun getTotalTimeRunning(startTime: Long): Long {
133135
val currentTime = Clock.System.now().toEpochMilliseconds()
134136
return (currentTime - startTime)

β€Žconfettikit/src/commonMain/kotlin/io/github/vinceglb/confettikit/core/PartySystem.ktβ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import io.github.vinceglb.confettikit.core.emitter.BaseEmitter
44
import io.github.vinceglb.confettikit.core.emitter.Confetti
55
import io.github.vinceglb.confettikit.core.emitter.PartyEmitter
66
import io.github.vinceglb.confettikit.core.models.CoreRect
7-
import kotlinx.datetime.Clock
7+
import kotlin.time.Clock
8+
import kotlin.time.ExperimentalTime
89

910
/**
1011
* PartySystem is responsible for requesting particles from the emitter and updating the particles
@@ -13,6 +14,7 @@ import kotlinx.datetime.Clock
1314
* @param createdAt timestamp of when the partySystem is created
1415
* @param pixelDensity default value taken from resources to measure based on pixelDensity
1516
*/
17+
@OptIn(ExperimentalTime::class)
1618
public class PartySystem(
1719
public val party: Party,
1820
public val createdAt: Long = Clock.System.now().toEpochMilliseconds(),

β€Žgradle/libs.versions.tomlβ€Ž

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ android-targetSdk = "36"
66
androidx-activityCompose = "1.10.1"
77
compose-multiplatform = "1.8.2"
88
kotlin = "2.2.0"
9-
kotlinx-datetime = "0.7.0"
109
vanniktech-mavenPublish = "0.33.0"
1110
androidx-lifecycle = "2.9.1"
1211

1312
[libraries]
1413
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
15-
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
1614
androidx-lifecycle-runtime-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
1715

1816
[plugins]

0 commit comments

Comments
Β (0)