From b2d4666a4b44882dd156e25d6f0013ddad6a7655 Mon Sep 17 00:00:00 2001 From: "Nicholas (MD3 )" Date: Fri, 5 Jul 2024 12:01:18 +0400 Subject: [PATCH] Bump dependencies --- app/build.gradle.kts | 8 ++++---- .../org/akanework/gramophone/logic/ui/CoilCrossfade.kt | 4 ++-- .../akanework/gramophone/ui/components/FullBottomSheet.kt | 1 + .../gramophone/ui/components/PlayerBottomSheet.kt | 1 + build.gradle.kts | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a07c19f62..a027f84d0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,7 +5,7 @@ import com.android.build.gradle.tasks.PackageAndroidArtifact import org.jetbrains.kotlin.util.removeSuffixIfPresent import java.util.Properties -val aboutLibsVersion = "11.2.1" // keep in sync with plugin version +val aboutLibsVersion = "11.2.2" // keep in sync with plugin version plugins { id("com.android.application") @@ -195,8 +195,8 @@ dependencies { implementation("androidx.core:core-ktx:1.13.1") implementation("androidx.core:core-splashscreen:1.0.1") //implementation("androidx.datastore:datastore-preferences:1.1.0-rc01") TODO don't abuse shared prefs - implementation("androidx.fragment:fragment-ktx:1.8.0-rc01") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1") + implementation("androidx.fragment:fragment-ktx:1.8.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3") implementation("androidx.media3:media3-exoplayer:$media3Version") implementation("androidx.media3:media3-exoplayer-midi:$media3Version") implementation("androidx.media3:media3-session:$media3Version") @@ -208,7 +208,7 @@ dependencies { implementation("com.mikepenz:aboutlibraries:$aboutLibsVersion") implementation("com.google.android.material:material:1.12.0") implementation("me.zhanghai.android.fastscroll:library:1.3.0") - implementation("io.coil-kt.coil3:coil:3.0.0-alpha06") + implementation("io.coil-kt.coil3:coil:3.0.0-alpha07") //noinspection GradleDependency newer versions need java.nio which is api 26+ //implementation("com.github.albfernandez:juniversalchardet:2.0.3") TODO coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") // TODO kill it once alpha2 is out diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/ui/CoilCrossfade.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/ui/CoilCrossfade.kt index d00755df4..0300a0cb7 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/logic/ui/CoilCrossfade.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/logic/ui/CoilCrossfade.kt @@ -2,10 +2,10 @@ package org.akanework.gramophone.logic.ui import androidx.appcompat.content.res.AppCompatResources import coil3.annotation.ExperimentalCoilApi -import coil3.asCoilImage +import coil3.asImage import coil3.request.ImageRequest @OptIn(ExperimentalCoilApi::class) fun ImageRequest.Builder.placeholderScaleToFit(placeholder: Int) { - placeholder { ScaleDrawable(AppCompatResources.getDrawable(it.context, placeholder)!!).asCoilImage() } + placeholder { ScaleDrawable(AppCompatResources.getDrawable(it.context, placeholder)!!).asImage() } } \ No newline at end of file diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt index 164194d43..edea0ae07 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt @@ -42,6 +42,7 @@ import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import coil3.annotation.ExperimentalCoilApi +import coil3.asDrawable import coil3.dispose import coil3.imageLoader import coil3.load diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/components/PlayerBottomSheet.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/components/PlayerBottomSheet.kt index dd3e98961..1cfb87e04 100644 --- a/app/src/main/kotlin/org/akanework/gramophone/ui/components/PlayerBottomSheet.kt +++ b/app/src/main/kotlin/org/akanework/gramophone/ui/components/PlayerBottomSheet.kt @@ -43,6 +43,7 @@ import androidx.media3.common.Player import androidx.media3.session.MediaController import androidx.preference.PreferenceManager import coil3.annotation.ExperimentalCoilApi +import coil3.asDrawable import coil3.imageLoader import coil3.request.Disposable import coil3.request.ImageRequest diff --git a/build.gradle.kts b/build.gradle.kts index b5d95b4db..8fcf323b3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - val agpVersion = "8.5.0-rc01" + val agpVersion = "8.5.0" id("com.android.application") version agpVersion apply false id("com.android.test") version agpVersion apply false id("androidx.baselineprofile") version "1.2.3" apply false