Skip to content

Commit 25ab649

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/kotlin/Version.kt
2 parents e5e405e + ca8ae48 commit 25ab649

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/main/kotlin/Version.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ object Version {
5959
const val composeMaterial3 = "1.1.0" // https://developer.android.com/jetpack/androidx/releases/compose
6060
const val composeNavigation = "2.5.3" // https://androidx.tech/artifacts/navigation/navigation-compose/
6161
const val composeHiltNavigation = "1.0.0" // https://developer.android.com/jetpack/androidx/releases/hilt
62+
63+
// https://github.com/JetBrains/compose-multiplatform/blob/master/VERSIONING.md#kotlin-compatibility
6264
const val composeMultiPlatform = "1.4.0" // https://github.com/JetBrains/compose-jb
6365

6466
// TestImplementation
@@ -82,6 +84,7 @@ object Version {
8284

8385
object JetBrains {
8486
// https://developer.android.com/jetpack/androidx/releases/compose-kotlin - Compability For Compose Version
87+
// https://github.com/JetBrains/compose-multiplatform/blob/master/VERSIONING.md#kotlin-compatibility
8588
const val kotlin = "1.8.20" // https://kotlinlang.org/docs/releases.html#release-details
8689
const val coroutines = "1.7.1" // https://github.com/Kotlin/kotlinx.coroutines
8790
}

0 commit comments

Comments
 (0)