Skip to content

Commit 2cc8afe

Browse files
committed
Remove recommendation to pin annotation-experimental to version 1.2.0
This was intended to avoid bringing in a transitive dependency on the Kotlin standard library, but Gradle no longer flags lint errors on `@RequiresOptIn` violations with `annotation-experimental:1.2.0` (1.3.0 is needed), making this recommendation dangerous. See also https://issuetracker.google.com/310651921. PiperOrigin-RevId: 582276430 (cherry picked from commit aa1ec98)
1 parent 1b83c59 commit 2cc8afe

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

RELEASENOTES.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@ This release includes the following changes since the
2525
`PlayerView.setShowPlayButtonIfPlaybackIsSuppressed(false)` or
2626
`MediaSession.Builder.setShowPlayButtonIfPlaybackIsSuppressed(false)`
2727
([#11213](https://github.com/google/ExoPlayer/issues/11213)).
28-
* Upgrade `androidx.annotation:annotation-experimental` to `1.3.1`. This
29-
also introduces a transitive dependency on the Kotlin standard library
30-
from `media3-common`. Apps can
31-
[downgrade to remove this dependency if they want](https://developer.android.com/guide/topics/media/exoplayer/shrinking#remove-kotlin-dep).
32-
Fixes https://issuetracker.google.com/251172715.
28+
* Upgrade `androidx.annotation:annotation-experimental` to `1.3.1` to fix
29+
https://issuetracker.google.com/251172715.
3330
* Move `ExoPlayer.setAudioAttributes` to the `Player` interface.
3431
* ExoPlayer:
3532
* Fix seeking issues in AC4 streams caused by not identifying decode-only

demos/main/build.gradle

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,6 @@ android {
7272
dependencies {
7373
compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
7474
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
75-
// Demonstrate downgrading the annotation-experimental version to avoid
76-
// transitively depending on the Kotlin standard library (which was
77-
// introduced as a dependency in annotation-experimental:1.3.0). This demo
78-
// app still depends on Kotlin via the IMA extension and UI modules, but
79-
// this shows how an app can avoid the Kotlin dependency if they don't use
80-
// these modules.
81-
implementation('androidx.annotation:annotation-experimental') {
82-
version {
83-
strictly '1.2.0'
84-
}
85-
}
8675
implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
8776
implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
8877
implementation 'com.google.android.material:material:' + androidxMaterialVersion

0 commit comments

Comments
 (0)