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.

Sign up for GitHub

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

update to target SDK 35 and dependencies #109

Merged
merged 3 commits into from
Dec 11, 2024
Merged

update to target SDK 35 and dependencies #109

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b4b758
update to target SDK 35 and dependencies
ashnohe Dec 9, 2024
c631a39
revert media dependency
ashnohe Dec 11, 2024
2b98049
Merge branch 'main' into ashnohe_update
ashnohe Dec 11, 2024
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
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ secrets {

android {
namespace = "com.google.android.samples.socialite"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.google.android.samples.socialite"
minSdk = 21
targetSdk = 34
targetSdk = 35
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
4 changes: 2 additions & 2 deletions ...va/com/google/android/samples/socialite/ui/player/preloadmanager/PreloadManagerWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import androidx.media3.exoplayer.DefaultRenderersFactory
import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
import androidx.media3.exoplayer.source.MediaSource
import androidx.media3.exoplayer.source.preload.DefaultPreloadManager
import androidx.media3.exoplayer.source.preload.DefaultPreloadManager.Status.STAGE_LOADED_TO_POSITION_MS
import androidx.media3.exoplayer.source.preload.DefaultPreloadManager.Status.STAGE_LOADED_FOR_DURATION_MS
import androidx.media3.exoplayer.source.preload.TargetPreloadStatusControl
import androidx.media3.exoplayer.trackselection.DefaultTrackSelector
import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter
Expand Down Expand Up @@ -160,7 +160,7 @@ private constructor(
class PreloadStatusControl : TargetPreloadStatusControl<Int> {
override fun getTargetPreloadStatus(rankingData: Int): DefaultPreloadManager.Status {
// By default preload first 3 seconds of the video
return DefaultPreloadManager.Status(STAGE_LOADED_TO_POSITION_MS, 3000L)
return DefaultPreloadManager.Status(STAGE_LOADED_FOR_DURATION_MS, 3000L)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MayuriKhinvasara can you comment on whether this is the right update after updating to the latest media3 release?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a couple of changes to PreloadManager when updating to media3 1.5. We would have to test them before commits.

}
}
}
28 changes: 14 additions & 14 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,42 @@
[versions]
accompanist = "0.32.0"
activity = "1.9.3"
agp = "8.2.2"
benchmarkMacroJunit4 = "1.2.3"
baselineprofile = "1.2.3"
camera = "1.4.0-SNAPSHOT"
agp = "8.7.3"
benchmarkMacroJunit4 = "1.3.3"
baselineprofile = "1.3.3"
camera = "1.4.0"
cameraViewfinderCompose = "1.0.0-SNAPSHOT"
coil = "2.4.0"
compose_bom = "2024.04.00"
compose_bom = "2024.11.00"
composeCompiler = "1.5.4" # Used in app/build.gradle.kts
compose-foundation = "1.6.0-beta03"
concurrent = "1.1.0"
core = "1.12.0"
concurrent = "1.2.0"
core = "1.15.0"
core-splashscreen = "1.0.1"
espresso = "3.5.1"
espresso = "3.6.1"
graphics = "1.0.1"
hilt = "2.49"
hiltNavigationCompose = "1.2.0"
junit = "4.13.2"
kotlin = "1.9.20"
ksp = "1.9.20-1.0.14"
lifecycle = "2.7.0"
lifecycle = "2.8.7"
material3 = "1.3.1"
media3 = "1.4.0-rc01"
navigation = "2.8.3"
media3 = "1.5.0"
navigation = "2.8.4"
profileinstaller = "1.4.1"
room = "2.6.1"
spotless = "6.24.0"
test = "1.2.1"
truth = "1.1.3"
turbine = "1.0.0"
uiautomator = "2.3.0"
window = "1.2.0"
window = "1.3.0"
material3-adaptive-navigation-suite = "1.3.1"
glance = "1.1.1"
secrets = "2.0.1"
generativeai = "0.7.0"
datastore = "1.0.0"
generativeai = "0.9.0"
datastore = "1.1.1"


[libraries]
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Dec 08 17:47:03 JST 2022
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading