From dfe77f972731aa0278b13063b4eccbb83de3075e Mon Sep 17 00:00:00 2001 From: Ashutosh Gangwar Date: Sun, 10 Mar 2024 11:35:29 +0530 Subject: [PATCH 1/2] bump gradle, agp and deps --- app/build.gradle | 16 ++++++++-------- build.gradle | 8 ++++---- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1e3d52260..de6b187b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -91,21 +91,21 @@ project.afterEvaluate { } dependencies { - def androidXHiltVersion = '1.1.0' - def fragmentVersion = '1.6.1' - def media3Version = '1.2.0' + def androidXHiltVersion = '1.2.0' + def fragmentVersion = '1.6.2' + def media3Version = '1.3.0' def roomVersion = '2.6.1' def workManagerVersion = '2.9.0' def espressoVersion = '3.5.1' - def mockkVersion = '1.13.9' + def mockkVersion = '1.13.10' kapt "com.google.dagger:hilt-compiler:$deps.hiltVersion" kapt "androidx.hilt:hilt-compiler:$androidXHiltVersion" ksp "androidx.room:room-compiler:$roomVersion" implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.browser:browser:1.7.0' + implementation 'androidx.browser:browser:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "androidx.core:core-ktx:$deps.androidXCoreVersion" implementation "androidx.fragment:fragment-ktx:$fragmentVersion" @@ -140,11 +140,11 @@ dependencies { implementation project(":api-client") fullImplementation 'androidx.mediarouter:mediarouter:1.6.0' - fullImplementation 'com.android.billingclient:billing-ktx:6.1.0' - fullImplementation 'com.google.android.gms:play-services-base:18.2.0' + fullImplementation 'com.android.billingclient:billing-ktx:6.2.0' + fullImplementation 'com.google.android.gms:play-services-base:18.3.0' fullImplementation 'com.google.android.gms:play-services-cast-framework:21.4.0' fullImplementation 'com.google.android.play:core:1.10.3' - fullImplementation platform('com.google.firebase:firebase-bom:32.7.0') + fullImplementation platform('com.google.firebase:firebase-bom:32.7.4') fullImplementation 'com.google.firebase:firebase-analytics-ktx' fullImplementation 'com.google.firebase:firebase-crashlytics-ktx' diff --git a/build.gradle b/build.gradle index 71b96fcba..2ada231cd 100644 --- a/build.gradle +++ b/build.gradle @@ -3,13 +3,13 @@ plugins { id 'com.android.library' version "${agpVersion}" apply false id 'org.jetbrains.kotlin.android' version "${kotlinVersion}" apply false id 'org.jetbrains.kotlin.kapt' version "${kotlinVersion}" apply false - id 'com.google.devtools.ksp' version "1.9.22-1.0.17" apply false + id 'com.google.devtools.ksp' version "1.9.23-1.0.19" apply false id 'androidx.navigation.safeargs.kotlin' version "${navVersion}" apply false id 'com.google.dagger.hilt.android' version "${hiltVersion}" apply false id 'com.mikepenz.aboutlibraries.plugin' version "${aboutLibrariesVersion}" apply false - id 'com.google.gms.google-services' version '4.4.0' apply false // sed:free-build:remove + id 'com.google.gms.google-services' version '4.4.1' apply false // sed:free-build:remove id 'com.google.firebase.crashlytics' version '2.9.9' apply false // sed:free-build:remove id 'com.adarshr.test-logger' version '4.0.0' apply false @@ -20,10 +20,10 @@ project.ext { deps = [ aboutLibrariesVersion: "${aboutLibrariesVersion}", androidXCoreVersion : '1.12.0', - coroutinesVersion : '1.7.3', + coroutinesVersion : '1.8.0', hiltVersion : "${hiltVersion}", kotlinVersion : "${kotlinVersion}", - lifecycleVersion : '2.6.2', + lifecycleVersion : '2.7.0', navVersion : "${navVersion}", junitVersion : '4.13.2', diff --git a/gradle.properties b/gradle.properties index d432a75b1..fa102e119 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,8 +23,8 @@ android.nonFinalResIds=false # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official # gradle plugin dependencies -agpVersion=8.2.0 -hiltVersion=2.50 -kotlinVersion=1.9.22 -navVersion=2.7.6 -aboutLibrariesVersion=10.9.2 +agpVersion=8.3.0 +hiltVersion=2.51 +kotlinVersion=1.9.23 +navVersion=2.7.7 +aboutLibrariesVersion=11.1.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db8c3baaf..4baf5a11d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 88200c96ae53b22a14d4d37d32e4bb41a2073657 Mon Sep 17 00:00:00 2001 From: Ashutosh Gangwar Date: Sun, 10 Mar 2024 12:00:58 +0530 Subject: [PATCH 2/2] fix ShadowMediaSession --- .../github/ashutoshgngwr/noice/shadows/ShadowMediaSession.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/test/java/com/github/ashutoshgngwr/noice/shadows/ShadowMediaSession.kt b/app/src/test/java/com/github/ashutoshgngwr/noice/shadows/ShadowMediaSession.kt index ce62cd982..a4b8e6da1 100644 --- a/app/src/test/java/com/github/ashutoshgngwr/noice/shadows/ShadowMediaSession.kt +++ b/app/src/test/java/com/github/ashutoshgngwr/noice/shadows/ShadowMediaSession.kt @@ -49,6 +49,7 @@ class ShadowMediaSession : Player.Listener { customLayout: ImmutableList, callback: MediaSession.Callback, tokenExtras: Bundle, + sessionExtras: Bundle, bitmapLoader: BitmapLoader, playIfSuppressed: Boolean, isPeriodicPositionUpdateEnabled: Boolean, @@ -63,6 +64,7 @@ class ShadowMediaSession : Player.Listener { ReflectionHelpers.ClassParameter.from(ImmutableList::class.java, customLayout), ReflectionHelpers.ClassParameter.from(MediaSession.Callback::class.java, callback), ReflectionHelpers.ClassParameter.from(Bundle::class.java, tokenExtras), + ReflectionHelpers.ClassParameter.from(Bundle::class.java, sessionExtras), ReflectionHelpers.ClassParameter.from(BitmapLoader::class.java, bitmapLoader), ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, playIfSuppressed), ReflectionHelpers.ClassParameter.from(