Madeorsk/SpotiFlyer
1
0
Fork 0
mirror of https://github.com/Shabinder/SpotiFlyer.git synced 2024-11-22 09:04:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dep Updates and Build Fixes

Browse Source
This commit is contained in:
shabinder 2021-06-19 02:13:45 +05:30
parent f41c6bc1cf
commit 33c53506e2
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
buildSrc/buildSrc/src/main/kotlin/Versions.kt
View File

@ -23,13 +23,13 @@ object Versions {
// Kotlin // Kotlin
const val kotlinVersion = "1.5.10" const val kotlinVersion = "1.5.10"
const val coroutinesVersion = "1.4.2" const val coroutinesVersion = "1.5.0"
// Code Formatting // Code Formatting
const val ktLint = "10.0.0" const val ktLint = "10.1.0"
// DI // DI
const val koin = "3.0.2" const val koin = "3.1.0"
// Logger // Logger
const val kermit = "0.1.9" const val kermit = "0.1.9"
@ -43,7 +43,7 @@ object Versions {
const val sqlDelight = "1.5.0" const val sqlDelight = "1.5.0"
const val sqliteJdbcDriver = "3.34.0" const val sqliteJdbcDriver = "3.34.0"
const val slf4j = "1.7.30" const val slf4j = "1.7.31"
// Android // Android
const val minSdkVersion = 21 const val minSdkVersion = 21
@ -64,12 +64,12 @@ object Koin {
val core = "io.insert-koin:koin-core:${Versions.koin}" val core = "io.insert-koin:koin-core:${Versions.koin}"
val test = "io.insert-koin:koin-test:${Versions.koin}" val test = "io.insert-koin:koin-test:${Versions.koin}"
val android = "io.insert-koin:koin-android:${Versions.koin}" val android = "io.insert-koin:koin-android:${Versions.koin}"
val compose = "io.insert-koin:koin-androidx-compose:3.0.1" val compose = "io.insert-koin:koin-androidx-compose:${Versions.koin}"
} }
object Androidx { object Androidx {
const val androidxActivity = "androidx.activity:activity-compose:1.3.0-alpha07" const val androidxActivity = "androidx.activity:activity-compose:1.3.0-beta02"
const val core = "androidx.core:core-ktx:1.3.2" const val core = "androidx.core:core-ktx:1.5.0"
const val palette = "androidx.palette:palette-ktx:1.0.0" const val palette = "androidx.palette:palette-ktx:1.0.0"
const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutinesVersion}" const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutinesVersion}"
@ -112,7 +112,7 @@ object Decompose {
} }
object MVIKotlin { object MVIKotlin {
private const val VERSION = "2.0.3" private const val VERSION = "2.0.4"
const val rx = "com.arkivanov.mvikotlin:rx:$VERSION" const val rx = "com.arkivanov.mvikotlin:rx:$VERSION"
const val mvikotlin = "com.arkivanov.mvikotlin:mvikotlin:$VERSION" const val mvikotlin = "com.arkivanov.mvikotlin:mvikotlin:$VERSION"
const val mvikotlinMain = "com.arkivanov.mvikotlin:mvikotlin-main:$VERSION" const val mvikotlinMain = "com.arkivanov.mvikotlin:mvikotlin-main:$VERSION"
@ -150,7 +150,7 @@ object Extras {
object Android { object Android {
object Acra { object Acra {
// Self Hosted Crashlytics (FOSS) // Self Hosted Crashlytics (FOSS)
private const val VERSION = "5.8.1-beta11" private const val VERSION = "5.8.3"
val http = "ch.acra:acra-http:$VERSION" val http = "ch.acra:acra-http:$VERSION"
val notification = "ch.acra:acra-notification:$VERSION" val notification = "ch.acra:acra-notification:$VERSION"
} }
@ -160,10 +160,6 @@ object Extras {
} }
} }
object JetpackDataStore {
val dep = "androidx.datastore:datastore-preferences-core:1.0.0-alpha05"
}
object Serialization { object Serialization {
val json = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinxSerialization}" val json = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinxSerialization}"
} }

3
common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DonationDialog.kt
View File

@ -21,9 +21,10 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.v1.Dialog
import com.shabinder.common.models.methods import com.shabinder.common.models.methods
@OptIn(ExperimentalAnimationApi::class) @OptIn(ExperimentalAnimationApi::class, androidx.compose.ui.ExperimentalComposeUiApi::class)
@Composable @Composable
actual fun DonationDialog( actual fun DonationDialog(
isVisible: Boolean, isVisible: Boolean,

4
desktop/src/jvmMain/kotlin/Main.kt
View File

@ -77,7 +77,7 @@ fun main() {
typography = SpotiFlyerTypography, typography = SpotiFlyerTypography,
shapes = SpotiFlyerShapes shapes = SpotiFlyerShapes
) { ) {
val root = SpotiFlyerRootContent(rememberRootComponent(factory = ::spotiFlyerRoot)) val root: SpotiFlyerRoot = SpotiFlyerRootContent(rememberRootComponent(factory = ::spotiFlyerRoot))
showToast = root.callBacks::showToast showToast = root.callBacks::showToast
} }
} }
@ -95,7 +95,7 @@ private fun spotiFlyerRoot(componentContext: ComponentContext): SpotiFlyerRoot =
override val directories: Dir = koin.get() override val directories: Dir = koin.get()
override val database: Database? = directories.db override val database: Database? = directories.db
override val downloadProgressReport = DownloadProgressFlow override val downloadProgressReport = DownloadProgressFlow
override val actions = object: Actions { override val actions: Actions = object: Actions {
override val platformActions = object : PlatformActions {} override val platformActions = object : PlatformActions {}
override fun showPopUpMessage(string: String, long: Boolean) { override fun showPopUpMessage(string: String, long: Boolean) {