Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Gradle, AGP and deps #1184

Merged
merged 2 commits into from
Jun 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,29 +91,29 @@
}

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'

Check warning on line 107 in app/build.gradle

View workflow job for this annotation

GitHub Actions / Lint

Obsolete Gradle Dependency: A newer version of androidx.appcompat:appcompat than 1.6.1 is available: 1.7.0
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"

Check warning on line 110 in app/build.gradle

View workflow job for this annotation

GitHub Actions / Lint

Obsolete Gradle Dependency: A newer version of androidx.core:core-ktx than 1.12.0 is available: 1.13.1
implementation "androidx.fragment:fragment-ktx:$fragmentVersion"

Check warning on line 111 in app/build.gradle

View workflow job for this annotation

GitHub Actions / Lint

Obsolete Gradle Dependency: A newer version of androidx.fragment:fragment-ktx than 1.6.2 is available: 1.7.1
implementation "androidx.hilt:hilt-work:$androidXHiltVersion"
implementation "androidx.lifecycle:lifecycle-common-java8:$deps.lifecycleVersion"

Check warning on line 113 in app/build.gradle

View workflow job for this annotation

GitHub Actions / Lint

Obsolete Gradle Dependency: A newer version of androidx.lifecycle:lifecycle-common-java8 than 2.7.0 is available: 2.8.1
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$deps.lifecycleVersion"

Check warning on line 114 in app/build.gradle

View workflow job for this annotation

GitHub Actions / Lint

Obsolete Gradle Dependency: A newer version of androidx.lifecycle:lifecycle-viewmodel-ktx than 2.7.0 is available: 2.8.1
implementation 'androidx.media:media:1.7.0' // needed for audio focus management.
implementation "androidx.media3:media3-common:$media3Version"

Check warning on line 116 in app/build.gradle

View workflow job for this annotation

GitHub Actions / Lint

Obsolete Gradle Dependency: A newer version of androidx.media3:media3-common than 1.3.0 is available: 1.3.1
implementation "androidx.media3:media3-exoplayer:$media3Version"
implementation "androidx.media3:media3-exoplayer-workmanager:$media3Version"
implementation "androidx.media3:media3-session:$media3Version"
Expand All @@ -140,11 +140,11 @@
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'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class ShadowMediaSession : Player.Listener {
customLayout: ImmutableList<CommandButton>,
callback: MediaSession.Callback,
tokenExtras: Bundle,
sessionExtras: Bundle,
bitmapLoader: BitmapLoader,
playIfSuppressed: Boolean,
isPeriodicPositionUpdateEnabled: Boolean,
Expand All @@ -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(
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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',
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading