From d553fdf3224ae97dcdd0981d9a034039822c1046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pandula=20P=C3=A9ter?= Date: Mon, 11 Nov 2024 11:08:31 +0200 Subject: [PATCH] Update third party dependencies. --- gradle/libs.versions.toml | 21 ++++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- internal-core/build.gradle | 1 + .../beagle/core/BeagleImplementation.kt | 4 ++-- .../list/gallery/BugReportImageViewHolder.kt | 2 +- .../list/gallery/BugReportVideoViewHolder.kt | 5 +++-- .../gallery/MediaPreviewDialogFragment.kt | 7 ++++--- .../core/view/gallery/list/ImageViewHolder.kt | 2 +- .../core/view/gallery/list/VideoViewHolder.kt | 5 +++-- scripts/module-android.gradle | 2 +- 10 files changed, 28 insertions(+), 23 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 664258b9..0af8a929 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -androidx-annotation = "1.8.2" # https://developer.android.com/jetpack/androidx/releases/annotation +androidx-annotation = "1.9.1" # https://developer.android.com/jetpack/androidx/releases/annotation androidx-appcompat = "1.7.0" # https://developer.android.com/jetpack/androidx/releases/appcompat -androidx-constraintlayout = "2.1.4" # https://developer.android.com/jetpack/androidx/releases/constraintlayout -androidx-lifecycle = "2.8.5" # https://developer.android.com/jetpack/androidx/releases/lifecycle +androidx-constraintlayout = "2.2.0" # https://developer.android.com/jetpack/androidx/releases/constraintlayout +androidx-lifecycle = "2.8.7" # https://developer.android.com/jetpack/androidx/releases/lifecycle androidx-recyclerview = "1.3.2" # https://developer.android.com/jetpack/androidx/releases/recyclerview -coil = "2.7.0" # https://github.com/coil-kt/coil/releases -gradle = "8.5.2" # https://developer.android.com/studio/releases/gradle-plugin -kotlin-coroutines = "1.8.1" # https://github.com/Kotlin/kotlinx.coroutines/releases -kotlin-gradle = "2.0.20" # https://kotlinlang.org/docs/releases.html#release-details -kotlin-ksp = "2.0.20-1.0.25" # https://github.com/google/ksp/releases +coil = "3.0.2" # https://github.com/coil-kt/coil/releases +gradle = "8.7.2" # https://developer.android.com/studio/releases/gradle-plugin +kotlin-coroutines = "1.9.0" # https://github.com/Kotlin/kotlinx.coroutines/releases +kotlin-gradle = "2.0.21" # https://kotlinlang.org/docs/releases.html#release-details +kotlin-ksp = "2.0.21-1.0.27" # https://github.com/google/ksp/releases square-moshi = "1.15.1" # https://github.com/square/moshi/tags square-okhttp = "4.12.0" # https://github.com/square/okhttp/tags @@ -34,8 +34,9 @@ androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmode androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "androidx-multidex" } androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "androidx-recyclerview" } androidx-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidx-splashscreen" } -coil = { module = "io.coil-kt:coil", version.ref = "coil" } -coil-video = { module = "io.coil-kt:coil-video", version.ref = "coil" } +coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" } +coil-network = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" } +coil-video = { module = "io.coil-kt.coil3:coil-video", version.ref = "coil" } google-material = { module = "com.google.android.material:material", version.ref = "google-material" } gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" } koin = { module = "io.insert-koin:koin-android", version.ref = "koin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 32830d3d..6e2914a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/internal-core/build.gradle b/internal-core/build.gradle index c2433bd6..384a88e7 100644 --- a/internal-core/build.gradle +++ b/internal-core/build.gradle @@ -21,6 +21,7 @@ dependencies { implementation libs.androidx.lifecycle.process implementation libs.androidx.lifecycle.viewmodel implementation libs.coil + implementation libs.coil.network implementation libs.coil.video implementation libs.square.moshi ksp libs.square.moshi.codegen diff --git a/internal-core/src/main/java/com/pandulapeter/beagle/core/BeagleImplementation.kt b/internal-core/src/main/java/com/pandulapeter/beagle/core/BeagleImplementation.kt index 3906bdda..13d4edea 100644 --- a/internal-core/src/main/java/com/pandulapeter/beagle/core/BeagleImplementation.kt +++ b/internal-core/src/main/java/com/pandulapeter/beagle/core/BeagleImplementation.kt @@ -6,8 +6,8 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner -import coil.ImageLoader -import coil.decode.VideoFrameDecoder +import coil3.ImageLoader +import coil3.video.VideoFrameDecoder import com.pandulapeter.beagle.BeagleCore import com.pandulapeter.beagle.common.configuration.Appearance import com.pandulapeter.beagle.common.configuration.Behavior diff --git a/internal-core/src/main/java/com/pandulapeter/beagle/core/view/bugReport/list/gallery/BugReportImageViewHolder.kt b/internal-core/src/main/java/com/pandulapeter/beagle/core/view/bugReport/list/gallery/BugReportImageViewHolder.kt index 8242b635..2d132ca8 100644 --- a/internal-core/src/main/java/com/pandulapeter/beagle/core/view/bugReport/list/gallery/BugReportImageViewHolder.kt +++ b/internal-core/src/main/java/com/pandulapeter/beagle/core/view/bugReport/list/gallery/BugReportImageViewHolder.kt @@ -3,7 +3,7 @@ package com.pandulapeter.beagle.core.view.bugReport.list.gallery import android.view.ViewGroup import android.widget.CompoundButton import androidx.recyclerview.widget.RecyclerView -import coil.load +import coil3.load import com.pandulapeter.beagle.core.databinding.BeagleItemBugReportGalleryImageBinding import com.pandulapeter.beagle.core.util.extension.getScreenCapturesFolder import com.pandulapeter.beagle.utils.consume diff --git a/internal-core/src/main/java/com/pandulapeter/beagle/core/view/bugReport/list/gallery/BugReportVideoViewHolder.kt b/internal-core/src/main/java/com/pandulapeter/beagle/core/view/bugReport/list/gallery/BugReportVideoViewHolder.kt index 07248911..3fa34202 100644 --- a/internal-core/src/main/java/com/pandulapeter/beagle/core/view/bugReport/list/gallery/BugReportVideoViewHolder.kt +++ b/internal-core/src/main/java/com/pandulapeter/beagle/core/view/bugReport/list/gallery/BugReportVideoViewHolder.kt @@ -3,7 +3,8 @@ package com.pandulapeter.beagle.core.view.bugReport.list.gallery import android.view.ViewGroup import android.widget.CompoundButton import androidx.recyclerview.widget.RecyclerView -import coil.request.ImageRequest +import coil3.request.ImageRequest +import coil3.target.ImageViewTarget import com.pandulapeter.beagle.BeagleCore import com.pandulapeter.beagle.core.databinding.BeagleItemBugReportGalleryVideoBinding import com.pandulapeter.beagle.core.util.extension.getScreenCapturesFolder @@ -54,7 +55,7 @@ internal class BugReportVideoViewHolder private constructor( BeagleCore.implementation.videoThumbnailLoader.execute( ImageRequest.Builder(context) .data(context.getScreenCapturesFolder().resolve(uiModel.fileName)) - .target(imageView) + .target(ImageViewTarget(imageView)) .build() ) } diff --git a/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/MediaPreviewDialogFragment.kt b/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/MediaPreviewDialogFragment.kt index a71f6d4d..d2f946e8 100644 --- a/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/MediaPreviewDialogFragment.kt +++ b/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/MediaPreviewDialogFragment.kt @@ -7,8 +7,9 @@ import android.widget.ImageView import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment import androidx.fragment.app.FragmentManager -import coil.load -import coil.request.ImageRequest +import coil3.load +import coil3.request.ImageRequest +import coil3.target.ImageViewTarget import com.pandulapeter.beagle.BeagleCore import com.pandulapeter.beagle.core.R import com.pandulapeter.beagle.core.databinding.BeagleDialogFragmentMediaPreviewBinding @@ -63,7 +64,7 @@ class MediaPreviewDialogFragment : DialogFragment(), DeleteConfirmationDialogFra BeagleCore.implementation.videoThumbnailLoader.execute( ImageRequest.Builder(context) .data(context.getScreenCapturesFolder().resolve(fileName)) - .target(this@run) + .target(ImageViewTarget(this@run)) .listener { _, _ -> setDialogSizeFromImage(this@run) } .build() ) diff --git a/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/list/ImageViewHolder.kt b/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/list/ImageViewHolder.kt index 03b6ab7d..e691744e 100644 --- a/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/list/ImageViewHolder.kt +++ b/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/list/ImageViewHolder.kt @@ -3,7 +3,7 @@ package com.pandulapeter.beagle.core.view.gallery.list import android.view.ViewGroup import android.widget.CompoundButton import androidx.recyclerview.widget.RecyclerView -import coil.load +import coil3.load import com.pandulapeter.beagle.core.databinding.BeagleItemGalleryImageBinding import com.pandulapeter.beagle.core.util.extension.getScreenCapturesFolder import com.pandulapeter.beagle.core.util.extension.visible diff --git a/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/list/VideoViewHolder.kt b/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/list/VideoViewHolder.kt index c5b49ad9..3534d06d 100644 --- a/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/list/VideoViewHolder.kt +++ b/internal-core/src/main/java/com/pandulapeter/beagle/core/view/gallery/list/VideoViewHolder.kt @@ -3,7 +3,8 @@ package com.pandulapeter.beagle.core.view.gallery.list import android.view.ViewGroup import android.widget.CompoundButton import androidx.recyclerview.widget.RecyclerView -import coil.request.ImageRequest +import coil3.request.ImageRequest +import coil3.target.ImageViewTarget import com.pandulapeter.beagle.BeagleCore import com.pandulapeter.beagle.core.databinding.BeagleItemGalleryVideoBinding import com.pandulapeter.beagle.core.util.extension.getScreenCapturesFolder @@ -56,7 +57,7 @@ internal class VideoViewHolder private constructor( BeagleCore.implementation.videoThumbnailLoader.execute( ImageRequest.Builder(context) .data(context.getScreenCapturesFolder().resolve(uiModel.fileName)) - .target(binding.beagleMediaView.imageView) + .target(ImageViewTarget(binding.beagleMediaView.imageView)) .build() ) } diff --git a/scripts/module-android.gradle b/scripts/module-android.gradle index 31a62e39..ae9952cc 100644 --- a/scripts/module-android.gradle +++ b/scripts/module-android.gradle @@ -8,7 +8,7 @@ android { } lint.abortOnError false kotlin{ - jvmToolchain(17) + jvmToolchain(21) } publishing { singleVariant("release") {