From 43ca70daf7e9b50494ed7eb3cb9d998900b68f6f Mon Sep 17 00:00:00 2001 From: shabinder Date: Sat, 10 Jul 2021 12:59:34 +0530 Subject: [PATCH] Dep Updates --- android/build.gradle.kts | 2 +- .../src/main/java/com/shabinder/spotiflyer/MainActivity.kt | 2 +- buildSrc/buildSrc/src/main/kotlin/Versions.kt | 4 +++- .../src/main/kotlin/multiplatform-compose-setup.gradle.kts | 2 +- buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts | 2 +- .../com/shabinder/common/uikit/screens/SpotiFlyerListUi.kt | 6 ++---- .../com/shabinder/common/uikit/screens/SpotiFlyerMainUi.kt | 6 +++--- common/dependency-injection/build.gradle.kts | 2 +- web-app/build.gradle.kts | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index ab8e3ac0..5c606911 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -135,7 +135,7 @@ dependencies { implementation(Extras.kermit) //implementation("com.jakewharton.timber:timber:4.7.1") - implementation("dev.icerock.moko:parcelize:0.7.0") + implementation("dev.icerock.moko:parcelize:${Versions.mokoParcelize}") implementation("com.github.shabinder:storage-chooser:2.0.4.45") implementation("com.google.accompanist:accompanist-insets:0.12.0") diff --git a/android/src/main/java/com/shabinder/spotiflyer/MainActivity.kt b/android/src/main/java/com/shabinder/spotiflyer/MainActivity.kt index e5a69bc3..a3ea43a3 100644 --- a/android/src/main/java/com/shabinder/spotiflyer/MainActivity.kt +++ b/android/src/main/java/com/shabinder/spotiflyer/MainActivity.kt @@ -324,7 +324,7 @@ class MainActivity : ComponentActivity() { val clip = ClipData.newPlainText("SpotiFlyer Selection", text) clipboard.setPrimaryClip(clip) - showPopUpMessage("StackTrace Copied to Clipboard.") + showPopUpMessage("Text Copied to Clipboard.") } override fun openPlatform(packageID: String, platformLink: String) { diff --git a/buildSrc/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/buildSrc/src/main/kotlin/Versions.kt index afb068fb..3168b22e 100644 --- a/buildSrc/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/buildSrc/src/main/kotlin/Versions.kt @@ -38,6 +38,8 @@ object Versions { // Logger const val kermit = "0.1.9" + const val mokoParcelize = "0.7.1" + // Internet const val ktor = "1.6.0" @@ -156,7 +158,7 @@ object Internationalization { } object Extras { - const val youtubeDownloader = "io.github.shabinder:youtube-api-dl:1.2" + const val youtubeDownloader = "io.github.shabinder:youtube-api-dl:1.3" const val fuzzyWuzzy = "io.github.shabinder:fuzzywuzzy:1.1" const val mp3agic = "com.mpatric:mp3agic:0.9.0" const val jaudioTagger = "com.github.Shabinder:JAudioTagger-Android:1.0" diff --git a/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts index aa40306e..5fb0559f 100644 --- a/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts +++ b/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts @@ -42,7 +42,7 @@ kotlin { implementation(compose.animation) implementation(Extras.kermit) - implementation("dev.icerock.moko:parcelize:0.7.0") + implementation("dev.icerock.moko:parcelize:${Versions.mokoParcelize}") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-native-mt") { @Suppress("DEPRECATION") isForce = true diff --git a/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts index 3d017b07..7d32567b 100644 --- a/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts +++ b/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts @@ -65,7 +65,7 @@ kotlin { implementation(Extras.kermit) implementation(Serialization.json) implementation("co.touchlab:stately-common:1.1.7") - implementation("dev.icerock.moko:parcelize:0.7.0") + implementation("dev.icerock.moko:parcelize:${Versions.mokoParcelize}") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-native-mt") { @Suppress("DEPRECATION") isForce = true diff --git a/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerListUi.kt b/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerListUi.kt index 366b9e13..703d9934 100644 --- a/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerListUi.kt +++ b/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerListUi.kt @@ -14,9 +14,10 @@ * * along with this program. If not, see . */ +@file:Suppress("UNUSED_VARIABLE") + package com.shabinder.common.uikit.screens -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -34,7 +35,6 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material.CircularProgressIndicator -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.ExtendedFloatingActionButton import androidx.compose.material.Icon import androidx.compose.material.MaterialTheme @@ -74,7 +74,6 @@ import com.shabinder.common.uikit.dialogs.DonationDialogComponent import com.shabinder.common.uikit.dialogs.ErrorInfoDialog import com.shabinder.common.uikit.rememberScrollbarAdapter -@OptIn(ExperimentalMaterialApi::class) @Composable fun SpotiFlyerListContent( component: SpotiFlyerList, @@ -150,7 +149,6 @@ fun SpotiFlyerListContent( } } -@OptIn(ExperimentalAnimationApi::class) @Composable fun TrackCard( track: TrackDetails, diff --git a/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerMainUi.kt b/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerMainUi.kt index e227afec..1033d9cc 100644 --- a/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerMainUi.kt +++ b/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerMainUi.kt @@ -279,7 +279,7 @@ fun AboutColumn( "${Strings.open()} Spotify", tint = Color.Unspecified, modifier = Modifier.clip(SpotiFlyerShapes.small).clickable( - onClick = { methods.value.openPlatform("com.spotify.music", "http://open.spotify.com") } + onClick = { methods.value.openPlatform("com.spotify.music", "https://open.spotify.com") } ) ) Spacer(modifier = modifier.padding(start = 16.dp)) @@ -336,7 +336,7 @@ fun AboutColumn( Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().clickable( - onClick = { methods.value.openPlatform("", "http://github.com/Shabinder/SpotiFlyer") } + onClick = { methods.value.openPlatform("", "https://github.com/Shabinder/SpotiFlyer") } ) .padding(vertical = 6.dp) ) { @@ -355,7 +355,7 @@ fun AboutColumn( } Row( modifier = modifier.fillMaxWidth().padding(vertical = 6.dp) - .clickable(onClick = { methods.value.openPlatform("", "http://github.com/Shabinder/SpotiFlyer") }), + .clickable(onClick = { methods.value.openPlatform("", "https://github.com/Shabinder/SpotiFlyer/blob/main/CONTRIBUTING.md") }), verticalAlignment = Alignment.CenterVertically ) { Icon(Icons.Rounded.Flag, Strings.help() + Strings.translate(), Modifier.size(32.dp)) diff --git a/common/dependency-injection/build.gradle.kts b/common/dependency-injection/build.gradle.kts index 6852ae09..0242d640 100644 --- a/common/dependency-injection/build.gradle.kts +++ b/common/dependency-injection/build.gradle.kts @@ -30,7 +30,7 @@ kotlin { dependencies { implementation(project(":common:data-models")) implementation(project(":common:database")) - implementation("org.jetbrains.kotlinx:atomicfu:0.16.1") + implementation("org.jetbrains.kotlinx:atomicfu:0.16.2") implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.2.1") api(MultiPlatformSettings.dep) implementation(Extras.youtubeDownloader) diff --git a/web-app/build.gradle.kts b/web-app/build.gradle.kts index 204b0714..d72bc701 100644 --- a/web-app/build.gradle.kts +++ b/web-app/build.gradle.kts @@ -42,7 +42,7 @@ dependencies { implementation(project(":common:data-models")) implementation(project(":common:dependency-injection")) implementation("co.touchlab:stately-common:1.1.7") - implementation("dev.icerock.moko:parcelize:0.7.0") + implementation("dev.icerock.moko:parcelize:${Versions.mokoParcelize}") // implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1") { // https://youtrack.jetbrains.com/issue/KTOR-2670