summaryrefslogtreecommitdiff
path: root/Source/Android/app
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2025-11-17 20:29:21 +0100
committerGitHub <noreply@github.com>2025-11-17 20:29:21 +0100
commit0d22dc039292fc74b7cfe2b0ec413a2b52ed29b6 (patch)
tree0b23bc81c47579f159ef36da3cdc7824b2fc33bd /Source/Android/app
parentf966c55e0ca1318dc6619b4ec644fd76e2c87bc4 (diff)
parentcd0e40ba973d8add843c2cabb24769523bd3c7de (diff)
Merge pull request #14106 from Simonx22/android/dependency-updates-11102544758
Android: Update dependencies
Diffstat (limited to 'Source/Android/app')
-rw-r--r--Source/Android/app/build.gradle.kts33
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt2
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.kt2
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.kt2
4 files changed, 20 insertions, 19 deletions
diff --git a/Source/Android/app/build.gradle.kts b/Source/Android/app/build.gradle.kts
index 54a12a6058..dff980e170 100644
--- a/Source/Android/app/build.gradle.kts
+++ b/Source/Android/app/build.gradle.kts
@@ -122,35 +122,36 @@ android {
dependencies {
baselineProfile(project(":benchmark"))
- coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+ coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
- implementation("androidx.core:core-ktx:1.13.0")
- implementation("androidx.appcompat:appcompat:1.6.1")
+ implementation("androidx.core:core-ktx:1.17.0")
+ implementation("androidx.appcompat:appcompat:1.7.1")
implementation("androidx.cardview:cardview:1.0.0")
- implementation("androidx.recyclerview:recyclerview:1.3.2")
- implementation("androidx.constraintlayout:constraintlayout:2.1.4")
- implementation("androidx.fragment:fragment-ktx:1.6.2")
+ implementation("androidx.recyclerview:recyclerview:1.4.0")
+ implementation("androidx.constraintlayout:constraintlayout:2.2.1")
+ implementation("androidx.fragment:fragment-ktx:1.8.9")
implementation("androidx.slidingpanelayout:slidingpanelayout:1.2.0")
- implementation("com.google.android.material:material:1.11.0")
- implementation("androidx.core:core-splashscreen:1.0.1")
+ implementation("com.google.android.material:material:1.13.0")
+ implementation("androidx.core:core-splashscreen:1.2.0")
implementation("androidx.preference:preference-ktx:1.2.1")
- implementation("androidx.profileinstaller:profileinstaller:1.3.1")
+ implementation("androidx.profileinstaller:profileinstaller:1.4.1")
// Kotlin extensions for lifecycle components
- implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
- implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
+ implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4")
+ implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.4")
// Android TV UI libraries.
- implementation("androidx.leanback:leanback:1.0.0")
- implementation("androidx.tvprovider:tvprovider:1.0.0")
+ implementation("androidx.leanback:leanback:1.2.0")
+ implementation("androidx.tvprovider:tvprovider:1.1.0")
+ implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
// For loading game covers from disk and GameTDB
- implementation("io.coil-kt:coil:2.6.0")
+ implementation("io.coil-kt:coil:2.7.0")
// For loading custom GPU drivers
- implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
+ implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
implementation("com.nononsenseapps:filepicker:4.2.1")
}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt
index 754c089876..4f43601e68 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt
@@ -41,7 +41,7 @@ class GameRowPresenter : Presenter() {
return TvGameViewHolder(gameCard)
}
- override fun onBindViewHolder(viewHolder: ViewHolder, item: Any) {
+ override fun onBindViewHolder(viewHolder: ViewHolder, item: Any?) {
val holder = viewHolder as TvGameViewHolder
val context = holder.cardParent.context
val gameFile = item as GameFile
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.kt
index c52039c5b2..f67a23e2da 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.kt
@@ -25,7 +25,7 @@ class SettingsRowPresenter : Presenter() {
return TvSettingsViewHolder(settingsCard)
}
- override fun onBindViewHolder(viewHolder: ViewHolder, item: Any) {
+ override fun onBindViewHolder(viewHolder: ViewHolder, item: Any?) {
val holder = viewHolder as TvSettingsViewHolder
val context = holder.cardParent.context
val settingsItem = item as TvSettingsItem
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.kt
index 6fc5adbfa7..9c868eeca9 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvGameViewHolder.kt
@@ -22,6 +22,6 @@ class TvGameViewHolder(itemView: View) : Presenter.ViewHolder(itemView) {
init {
itemView.tag = this
cardParent = itemView as ImageCardView
- imageScreenshot = cardParent.mainImageView
+ imageScreenshot = cardParent.mainImageView!!
}
}