From 5c17266ad485331859eb3a011fb9a3a862aa65c1 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 14 Dec 2023 11:13:13 +0100 Subject: [PATCH 01/17] Update versions plugin [0.47.0 -> 0.50.0] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 90234e4ad0..3960f09ad4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -107,7 +107,7 @@ android = { id = "com.android.application", version = "8.1.2" } # https://kotlinlang.org/docs/releases.html#release-details kotlin = { id = "org.jetbrains.kotlin.android", version = "1.8.22" } # https://github.com/ben-manes/gradle-versions-plugin/releases -versions = { id = "com.github.ben-manes.versions", version = "0.47.0" } +versions = { id = "com.github.ben-manes.versions", version = "0.50.0" } # https://github.com/gradle-nexus/publish-plugin/releases publish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" } google-services = { id = "com.google.gms.google-services", version = "4.3.15" } From c7fc4e618ee9a1f2cae66d255a55e5d32c12d15d Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 14 Dec 2023 11:26:56 +0100 Subject: [PATCH 02/17] Update Firebase BOM [32.2.2 -> 32.7.0], services + Crashlytics plugins. --- gradle/libs.versions.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3960f09ad4..af2f011a05 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -66,7 +66,7 @@ debugdrawer-timber = { module = "com.github.lenguyenthanh.debugdrawer:debugdrawe debugdrawer-view = { module = "com.github.lenguyenthanh.debugdrawer:debugdrawer-view", version.ref = "debugdrawer" } findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2" # https://firebase.google.com/support/release-notes/android -firebase = "com.google.firebase:firebase-bom:32.2.2" +firebase = "com.google.firebase:firebase-bom:32.7.0" firebase-ui-auth = "com.firebaseui:firebase-ui-auth:8.0.2" # https://github.com/firebase/FirebaseUI-Android/releases flatbuffers = "com.google.flatbuffers:flatbuffers-java:1.12.0" google-api-client = { module = "com.google.api-client:google-api-client", version.ref = "google-api-client" } @@ -110,7 +110,8 @@ kotlin = { id = "org.jetbrains.kotlin.android", version = "1.8.22" } versions = { id = "com.github.ben-manes.versions", version = "0.50.0" } # https://github.com/gradle-nexus/publish-plugin/releases publish = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" } -google-services = { id = "com.google.gms.google-services", version = "4.3.15" } -firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.8" } +# https://firebase.google.com/support/release-notes/android +google-services = { id = "com.google.gms.google-services", version = "4.4.0" } +firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.9" } # For endpoints plugin, version is actually set in settings.gradle.kts! endpoints = { id = "com.google.cloud.tools.endpoints-framework-gradle-plugin", version = "2.1.0" } From bdf0a5e4caefa50338ebc379f9cdca3389df1a26 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 14 Dec 2023 11:27:48 +0100 Subject: [PATCH 03/17] Update androidutils [3.1.0 -> 4.0.0] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index af2f011a05..babd2c3585 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ retrofit2 = "2.9.0" # https://github.com/square/retrofit/blob/master/CHANGELOG.m [libraries] amazon-appstore-sdk = "com.amazon.device:amazon-appstore-sdk:3.0.4" # https://developer.amazon.com/docs/in-app-purchasing/iap-whats-new.html -androidutils = "com.uwetrottmann.androidutils:androidutils:3.1.0" # https://github.com/UweTrottmann/AndroidUtils/releases +androidutils = "com.uwetrottmann.androidutils:androidutils:4.0.0" # https://github.com/UweTrottmann/AndroidUtils/releases # https://developer.android.com/jetpack/androidx/releases/activity androidx-activity = "androidx.activity:activity:1.7.2" androidx-activity-ktx = "androidx.activity:activity-ktx:1.7.2" From dff8535766d25bb562f400977be63991e09986e0 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 14 Dec 2023 11:29:58 +0100 Subject: [PATCH 04/17] Update AndroidX core [1.10.1 -> 1.12.0] --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index babd2c3585..7575ef42a2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,8 +22,8 @@ androidx-browser = "androidx.browser:browser:1.5.0" androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4" # https://developer.android.com/jetpack/androidx/releases/constraintlayout androidx-coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0" # https://developer.android.com/jetpack/androidx/releases/coordinatorlayout # https://developer.android.com/jetpack/androidx/releases/core -androidx-core = "androidx.core:core:1.10.1" -androidx-core-ktx = "androidx.core:core-ktx:1.10.1" +androidx-core = "androidx.core:core:1.12.0" +androidx-core-ktx = "androidx.core:core-ktx:1.12.0" # https://developer.android.com/jetpack/androidx/releases/fragment androidx-fragment = "androidx.fragment:fragment-ktx:1.6.1" androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } From 91a2433abd1906d74f822a6702a705ee89bbe317 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 14 Dec 2023 11:43:22 +0100 Subject: [PATCH 05/17] Suppress AsyncTask deprecation warnings. --- .../seriesguide/comments/TraktCommentsFragment.kt | 5 ++++- .../seriesguide/shows/search/discover/TraktAddFragment.kt | 4 +++- .../seriesguide/traktapi/CheckInDialogFragment.kt | 3 ++- .../seriesguide/traktapi/MovieCheckInDialogFragment.kt | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/battlelancer/seriesguide/comments/TraktCommentsFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/comments/TraktCommentsFragment.kt index 4378a29fbe..f28f0be781 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/comments/TraktCommentsFragment.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/comments/TraktCommentsFragment.kt @@ -1,5 +1,5 @@ -// Copyright 2023 Uwe Trottmann // SPDX-License-Identifier: Apache-2.0 +// Copyright 2012-2023 Uwe Trottmann package com.battlelancer.seriesguide.comments @@ -156,6 +156,7 @@ class TraktCommentsFragment : Fragment() { // comment for an episode? val episodeId = args.getLong(InitBundle.EPISODE_ID) if (episodeId != 0L) { + @Suppress("DEPRECATION") // AsyncTask TraktTask(context).commentEpisode(episodeId, comment, isSpoiler) .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR) return @@ -164,6 +165,7 @@ class TraktCommentsFragment : Fragment() { // comment for a movie? val movieTmdbId = args.getInt(InitBundle.MOVIE_TMDB_ID) if (movieTmdbId != 0) { + @Suppress("DEPRECATION") // AsyncTask TraktTask(context).commentMovie(movieTmdbId, comment, isSpoiler) .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR) return @@ -172,6 +174,7 @@ class TraktCommentsFragment : Fragment() { // comment for a show? val showId = args.getLong(InitBundle.SHOW_ID) if (showId != 0L) { + @Suppress("DEPRECATION") // AsyncTask TraktTask(context).commentShow(showId, comment, isSpoiler) .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR) } diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/TraktAddFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/TraktAddFragment.kt index 9e08b84dbe..e081e279a4 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/TraktAddFragment.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/TraktAddFragment.kt @@ -1,5 +1,5 @@ -// Copyright 2023 Uwe Trottmann // SPDX-License-Identifier: Apache-2.0 +// Copyright 2011-2023 Uwe Trottmann package com.battlelancer.seriesguide.shows.search.discover @@ -140,11 +140,13 @@ class TraktAddFragment : AddFragment() { override fun onMenuItemClick(item: MenuItem): Boolean { val itemId = item.itemId if (itemId == R.id.menu_action_show_watchlist_add) { + @Suppress("DEPRECATION") // AsyncTask AddShowToWatchlistTask(context, showTmdbId) .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR) return true } if (itemId == R.id.menu_action_show_watchlist_remove) { + @Suppress("DEPRECATION") // AsyncTask RemoveShowFromWatchlistTask(context, showTmdbId) .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR) return true diff --git a/app/src/main/java/com/battlelancer/seriesguide/traktapi/CheckInDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/traktapi/CheckInDialogFragment.kt index be5b974a13..e8c0f7b579 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/traktapi/CheckInDialogFragment.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/traktapi/CheckInDialogFragment.kt @@ -1,5 +1,5 @@ -// Copyright 2023 Uwe Trottmann // SPDX-License-Identifier: Apache-2.0 +// Copyright 2012-2018, 2020-2023 Uwe Trottmann package com.battlelancer.seriesguide.traktapi @@ -18,6 +18,7 @@ import com.battlelancer.seriesguide.util.safeShow class CheckInDialogFragment : GenericCheckInDialogFragment() { override fun checkInTrakt(message: String) { + @Suppress("DEPRECATION") // AsyncTask TraktTask(requireContext()).checkInEpisode( requireArguments().getLong(ARG_EPISODE_ID), requireArguments().getString(ARG_ITEM_TITLE), diff --git a/app/src/main/java/com/battlelancer/seriesguide/traktapi/MovieCheckInDialogFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/traktapi/MovieCheckInDialogFragment.kt index 5d0eaafeaa..7b42c3fa03 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/traktapi/MovieCheckInDialogFragment.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/traktapi/MovieCheckInDialogFragment.kt @@ -1,5 +1,5 @@ -// Copyright 2023 Uwe Trottmann // SPDX-License-Identifier: Apache-2.0 +// Copyright 2013, 2014, 2016-2018, 2022, 2023 Uwe Trottmann package com.battlelancer.seriesguide.traktapi @@ -15,6 +15,7 @@ import com.battlelancer.seriesguide.util.safeShow class MovieCheckInDialogFragment : GenericCheckInDialogFragment() { override fun checkInTrakt(message: String) { + @Suppress("DEPRECATION") // AsyncTask TraktTask(context).checkInMovie( requireArguments().getInt(ARG_MOVIE_TMDB_ID), requireArguments().getString(ARG_ITEM_TITLE), From a04d7cb24f1e4467fc91e8fd3d2312cff9367abf Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 14 Dec 2023 15:05:19 +0100 Subject: [PATCH 06/17] Suppress some more compiler warnings. --- .../seriesguide/shows/episodes/EpisodesActivity.kt | 3 ++- .../seriesguide/shows/search/discover/TraktAddFragment.kt | 2 +- .../java/com/battlelancer/seriesguide/util/SystemUiHider.kt | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodesActivity.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodesActivity.kt index 0f8d7b449f..b17f911387 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodesActivity.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodesActivity.kt @@ -1,5 +1,5 @@ -// Copyright 2023 Uwe Trottmann // SPDX-License-Identifier: Apache-2.0 +// Copyright 2019-2023 Uwe Trottmann package com.battlelancer.seriesguide.shows.episodes @@ -114,6 +114,7 @@ class EpisodesActivity : BaseMessageActivity() { } val episodeRowId = intent.getLongExtra(EXTRA_LONG_EPISODE_ID, 0) + @Suppress("DEPRECATION") // For backwards-compat val episodeTvdbId = intent.getIntExtra(EXTRA_EPISODE_TVDBID, 0) val seasonId = intent.getLongExtra(EXTRA_LONG_SEASON_ID, 0) diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/TraktAddFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/TraktAddFragment.kt index e081e279a4..fcceed3c62 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/TraktAddFragment.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/TraktAddFragment.kt @@ -191,7 +191,7 @@ class TraktAddFragment : AddFragment() { } @Subscribe(threadMode = ThreadMode.MAIN) - fun onEventMainThread(event: ShowChangedEvent?) { + fun onEventMainThread(@Suppress("UNUSED_PARAMETER") event: ShowChangedEvent?) { if (listType == TraktShowsLink.WATCHLIST) { // reload watchlist if a show was removed LoaderManager.getInstance(this) diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/SystemUiHider.kt b/app/src/main/java/com/battlelancer/seriesguide/util/SystemUiHider.kt index 3e984590b5..76f7d696c3 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/util/SystemUiHider.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/util/SystemUiHider.kt @@ -1,5 +1,8 @@ -// Copyright 2023 Uwe Trottmann // SPDX-License-Identifier: Apache-2.0 +// Copyright 2013-2019, 2022, 2023 Uwe Trottmann + +@file:Suppress("DEPRECATION") +// Not using WindowInsetsControllerCompat due to bugs, see note in FullscreenImageActivity package com.battlelancer.seriesguide.util From be27afb82dfb7321b44596f6479ea32b5a3ffb54 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 14 Dec 2023 15:50:56 +0100 Subject: [PATCH 07/17] ThemeUtils: use single insets controller instance for edge-to-edge. --- .../seriesguide/util/ThemeUtils.kt | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/ThemeUtils.kt b/app/src/main/java/com/battlelancer/seriesguide/util/ThemeUtils.kt index 16e7cf9807..136e7eec93 100644 --- a/app/src/main/java/com/battlelancer/seriesguide/util/ThemeUtils.kt +++ b/app/src/main/java/com/battlelancer/seriesguide/util/ThemeUtils.kt @@ -145,20 +145,20 @@ object ThemeUtils { // For transparent status bars (M+), check if the background has a light color; // for colored status bars check if itself has a light color. // If a light color, tell the system to color icons accordingly. - setLightStatusBar( - window, + val isLightStatusBar = if (forceDarkStatusBars) { false } else { isUsingLightSystemBar(statusBarColor, isLightBackground) } - ) // Do the same check for nav bars // (only difference: transparent nav bars supported since O_MR1+). - setLightNavigationBar( - window, - isUsingLightSystemBar(navigationBarColor, isLightBackground) - ) + val isLightNavigationBar = isUsingLightSystemBar(navigationBarColor, isLightBackground) + + WindowCompat.getInsetsController(window, window.decorView).run { + isAppearanceLightStatusBars = isLightStatusBar + isAppearanceLightNavigationBars = isLightNavigationBar + } } private fun getStatusBarColor(context: Context): Int { @@ -193,16 +193,6 @@ object ThemeUtils { } } - private fun setLightStatusBar(window: Window, isLight: Boolean) { - WindowCompat.getInsetsController(window, window.decorView) - .isAppearanceLightStatusBars = isLight - } - - private fun setLightNavigationBar(window: Window, isLight: Boolean) { - WindowCompat.getInsetsController(window, window.decorView) - .isAppearanceLightNavigationBars = isLight - } - private fun isUsingLightSystemBar( systemBarColor: Int, isLightBackground: Boolean From 1248e2cc03bea16740c77623b59240bc58a4c8ed Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 14 Dec 2023 15:56:50 +0100 Subject: [PATCH 08/17] Update androidx.activity [1.7.2 -> 1.8.2] Drop unused activity-ktx dependency. --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7575ef42a2..4056e2c12a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,8 +11,8 @@ retrofit2 = "2.9.0" # https://github.com/square/retrofit/blob/master/CHANGELOG.m amazon-appstore-sdk = "com.amazon.device:amazon-appstore-sdk:3.0.4" # https://developer.amazon.com/docs/in-app-purchasing/iap-whats-new.html androidutils = "com.uwetrottmann.androidutils:androidutils:4.0.0" # https://github.com/UweTrottmann/AndroidUtils/releases # https://developer.android.com/jetpack/androidx/releases/activity -androidx-activity = "androidx.activity:activity:1.7.2" -androidx-activity-ktx = "androidx.activity:activity-ktx:1.7.2" +androidx-activity = "androidx.activity:activity:1.8.2" +# https://developer.android.com/jetpack/androidx/releases/annotation androidx-annotation = "androidx.annotation:annotation:1.6.0" # https://developer.android.com/jetpack/androidx/releases/appcompat androidx-appcompat = "androidx.appcompat:appcompat:1.6.1" From e0a1fd7777153665263a67b00c50a94baadc6892 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Thu, 14 Dec 2023 15:57:19 +0100 Subject: [PATCH 09/17] Update androidx.annotation [1.6.0 -> 1.7.1] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4056e2c12a..0c036797f9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ androidutils = "com.uwetrottmann.androidutils:androidutils:4.0.0" # https://gith # https://developer.android.com/jetpack/androidx/releases/activity androidx-activity = "androidx.activity:activity:1.8.2" # https://developer.android.com/jetpack/androidx/releases/annotation -androidx-annotation = "androidx.annotation:annotation:1.6.0" +androidx-annotation = "androidx.annotation:annotation:1.7.1" # https://developer.android.com/jetpack/androidx/releases/appcompat androidx-appcompat = "androidx.appcompat:appcompat:1.6.1" # https://developer.android.com/jetpack/androidx/releases/browser From a2d8bc08b5548650caa801203c9dc0f7a90aa25d Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Fri, 15 Dec 2023 11:40:52 +0100 Subject: [PATCH 10/17] Bugfixes for some AndroidX libraries. --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0c036797f9..48b6b466c3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format [versions] -androidx-lifecycle = "2.6.1" # https://developer.android.com/jetpack/androidx/releases/lifecycle +androidx-lifecycle = "2.6.2" # https://developer.android.com/jetpack/androidx/releases/lifecycle debugdrawer = "0.9.0" # https://github.com/lenguyenthanh/DebugDrawer eventbus = "3.3.1" google-api-client = "2.2.0" # https://github.com/googleapis/google-api-java-client/releases @@ -25,17 +25,17 @@ androidx-coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0 androidx-core = "androidx.core:core:1.12.0" androidx-core-ktx = "androidx.core:core-ktx:1.12.0" # https://developer.android.com/jetpack/androidx/releases/fragment -androidx-fragment = "androidx.fragment:fragment-ktx:1.6.1" +androidx-fragment = "androidx.fragment:fragment-ktx:1.6.2" androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" } # https://developer.android.com/jetpack/androidx/releases/paging -androidx-paging = "androidx.paging:paging-runtime-ktx:3.2.0" +androidx-paging = "androidx.paging:paging-runtime-ktx:3.2.1" androidx-palette = "androidx.palette:palette-ktx:1.0.0" # https://developer.android.com/jetpack/androidx/releases/preference androidx-preference = "androidx.preference:preference-ktx:1.2.1" # https://developer.android.com/jetpack/androidx/releases/recyclerview -androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.1" +androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.2" # https://developer.android.com/jetpack/androidx/releases/room androidx-room-compiler = "androidx.room:room-compiler:2.5.2" androidx-room-ktx = "androidx.room:room-ktx:2.5.2" From 5e91de507d6c09f147fb15ace2969aa3fa5408ba Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Fri, 15 Dec 2023 12:10:52 +0100 Subject: [PATCH 11/17] Update androidx.browser [1.5.0 -> 1.7.0] --- gradle/libs.versions.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 48b6b466c3..33334d1f83 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,8 +17,7 @@ androidx-annotation = "androidx.annotation:annotation:1.7.1" # https://developer.android.com/jetpack/androidx/releases/appcompat androidx-appcompat = "androidx.appcompat:appcompat:1.6.1" # https://developer.android.com/jetpack/androidx/releases/browser -# Note: 1.6.0 requires SDK 34 -androidx-browser = "androidx.browser:browser:1.5.0" +androidx-browser = "androidx.browser:browser:1.7.0" androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4" # https://developer.android.com/jetpack/androidx/releases/constraintlayout androidx-coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0" # https://developer.android.com/jetpack/androidx/releases/coordinatorlayout # https://developer.android.com/jetpack/androidx/releases/core From c55130e75353e84d705d57f30902a5679641fac5 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Fri, 15 Dec 2023 12:15:10 +0100 Subject: [PATCH 12/17] Update dagger [2.47 -> 2.49] --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 33334d1f83..11099e945c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -56,8 +56,8 @@ androidx-viewpager = "androidx.viewpager:viewpager:1.0.0" androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.1.0-beta02" billing = "com.android.billingclient:billing-ktx:6.0.1" # https://developer.android.com/google/play/billing/billing_library_releases_notes # https://github.com/google/dagger/releases -dagger = "com.google.dagger:dagger:2.47" -dagger-compiler = "com.google.dagger:dagger-compiler:2.47" +dagger = "com.google.dagger:dagger:2.49" +dagger-compiler = "com.google.dagger:dagger-compiler:2.49" debugdrawer-actions = { module = "com.github.lenguyenthanh.debugdrawer:debugdrawer-actions", version.ref = "debugdrawer" } debugdrawer-base = { module = "com.github.lenguyenthanh.debugdrawer:debugdrawer-base", version.ref = "debugdrawer" } debugdrawer-commons = { module = "com.github.lenguyenthanh.debugdrawer:debugdrawer-commons", version.ref = "debugdrawer" } From 922e2971e9260b1bf4f09a8b3597a41fb828c5e4 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Fri, 15 Dec 2023 12:20:37 +0100 Subject: [PATCH 13/17] Update play-services-auth [20.6.0 -> 20.7.0] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 11099e945c..fa54ad2da2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -88,7 +88,7 @@ okhttp = "com.squareup.okhttp3:okhttp:4.11.0" # https://github.com/square/okhttp photoview = "com.github.chrisbanes:PhotoView:2.3.0" picasso = "com.squareup.picasso:picasso:2.8" # https://github.com/square/picasso/releases # https://developers.google.com/android/guides/releases -play-services-auth = "com.google.android.gms:play-services-auth:20.6.0" +play-services-auth = "com.google.android.gms:play-services-auth:20.7.0" retrofit2-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit2" } retrofit2 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit2" } # https://github.com/robolectric/robolectric/releases/ From 83d82ca020111e6d69441b980241531d345b11b8 Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Fri, 15 Dec 2023 12:34:50 +0100 Subject: [PATCH 14/17] Update okhttp [4.11.0 -> 4.12.0] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fa54ad2da2..eed911f61d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -84,7 +84,7 @@ kotlinx-coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3" kotlinx-result = "com.michael-bull.kotlin-result:kotlin-result:1.1.18" material = "com.google.android.material:material:1.10.0" # https://github.com/material-components/material-components-android/releases mockito = "org.mockito:mockito-core:4.5.1" -okhttp = "com.squareup.okhttp3:okhttp:4.11.0" # https://github.com/square/okhttp/blob/master/CHANGELOG.md +okhttp = "com.squareup.okhttp3:okhttp:4.12.0" # https://github.com/square/okhttp/blob/master/CHANGELOG.md photoview = "com.github.chrisbanes:PhotoView:2.3.0" picasso = "com.squareup.picasso:picasso:2.8" # https://github.com/square/picasso/releases # https://developers.google.com/android/guides/releases From 62900d226025ec08ea0ecc082fdf5d52c4ed264b Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Fri, 15 Dec 2023 12:39:02 +0100 Subject: [PATCH 15/17] Update tmdb-java [2.8.1 -> 2.10.0] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index eed911f61d..f9d565a299 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -96,7 +96,7 @@ robolectric = "org.robolectric:robolectric:4.9.2" taptargetview = "com.getkeepsafe.taptargetview:taptargetview:1.13.3" threetenabp = "com.jakewharton.threetenabp:threetenabp:1.4.6" # https://github.com/JakeWharton/ThreeTenABP/blob/master/CHANGELOG.md timber = "com.jakewharton.timber:timber:5.0.1" # https://github.com/JakeWharton/timber/blob/master/CHANGELOG.md -tmdb-java = "com.uwetrottmann.tmdb2:tmdb-java:2.8.1" # https://github.com/UweTrottmann/tmdb-java/blob/master/CHANGELOG.md +tmdb-java = "com.uwetrottmann.tmdb2:tmdb-java:2.10.0" # https://github.com/UweTrottmann/tmdb-java/blob/master/CHANGELOG.md trakt-java = "com.uwetrottmann.trakt5:trakt-java:6.11.2" # https://github.com/UweTrottmann/trakt-java/blob/master/CHANGELOG.md truth = "com.google.truth:truth:1.1.5" # https://github.com/google/truth/releases From a57f811d4aa7a86dc378a5958cdac81fa974626b Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Fri, 15 Dec 2023 12:49:11 +0100 Subject: [PATCH 16/17] Update mockito and robolectric [4.9.2 -> 4.11.1] Notably robolectric 4.11 supports Android SDK 34 --- gradle/libs.versions.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f9d565a299..4de6ec964e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -83,7 +83,9 @@ kotlinx-coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3" # https://github.com/michaelbull/kotlin-result/releases kotlinx-result = "com.michael-bull.kotlin-result:kotlin-result:1.1.18" material = "com.google.android.material:material:1.10.0" # https://github.com/material-components/material-components-android/releases -mockito = "org.mockito:mockito-core:4.5.1" +# https://github.com/mockito/mockito/releases +# mockito 5 requires JDK 11 +mockito = "org.mockito:mockito-core:4.11.0" okhttp = "com.squareup.okhttp3:okhttp:4.12.0" # https://github.com/square/okhttp/blob/master/CHANGELOG.md photoview = "com.github.chrisbanes:PhotoView:2.3.0" picasso = "com.squareup.picasso:picasso:2.8" # https://github.com/square/picasso/releases @@ -92,7 +94,7 @@ play-services-auth = "com.google.android.gms:play-services-auth:20.7.0" retrofit2-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit2" } retrofit2 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit2" } # https://github.com/robolectric/robolectric/releases/ -robolectric = "org.robolectric:robolectric:4.9.2" +robolectric = "org.robolectric:robolectric:4.11.1" taptargetview = "com.getkeepsafe.taptargetview:taptargetview:1.13.3" threetenabp = "com.jakewharton.threetenabp:threetenabp:1.4.6" # https://github.com/JakeWharton/ThreeTenABP/blob/master/CHANGELOG.md timber = "com.jakewharton.timber:timber:5.0.1" # https://github.com/JakeWharton/timber/blob/master/CHANGELOG.md From 10cabc3972b88179a900cbe52da42d08793f71bb Mon Sep 17 00:00:00 2001 From: Uwe Trottmann Date: Fri, 15 Dec 2023 13:04:13 +0100 Subject: [PATCH 17/17] Update Android plugin [8.1.2 -> 8.2.0] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4de6ec964e..39cd65ea21 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -104,7 +104,7 @@ truth = "com.google.truth:truth:1.1.5" # https://github.com/google/truth/release [plugins] # https://developer.android.com/build/releases/gradle-plugin -android = { id = "com.android.application", version = "8.1.2" } +android = { id = "com.android.application", version = "8.2.0" } # https://kotlinlang.org/docs/releases.html#release-details kotlin = { id = "org.jetbrains.kotlin.android", version = "1.8.22" } # https://github.com/ben-manes/gradle-versions-plugin/releases