From 81c2dd4be7a965318a3c97d36c79a1155fbff149 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Jul 2022 17:40:57 +0000 Subject: [PATCH 1/6] [video_player]: Bump exoplayer-dash Bumps [exoplayer-dash](https://github.com/google/ExoPlayer) from 2.17.1 to 2.18.1. - [Release notes](https://github.com/google/ExoPlayer/releases) - [Changelog](https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md) - [Commits](https://github.com/google/ExoPlayer/compare/r2.17.1...r2.18.1) --- updated-dependencies: - dependency-name: com.google.android.exoplayer:exoplayer-dash dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/video_player/video_player_android/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 32cc203729b8..fb777210ddff 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -45,7 +45,7 @@ android { dependencies { implementation 'com.google.android.exoplayer:exoplayer-core:2.17.1' implementation 'com.google.android.exoplayer:exoplayer-hls:2.17.1' - implementation 'com.google.android.exoplayer:exoplayer-dash:2.17.1' + implementation 'com.google.android.exoplayer:exoplayer-dash:2.18.1' implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.17.1' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-inline:3.9.0' From d364240dd86b4548d9464f65e35918292d1a95ea Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 27 Jul 2022 15:13:35 -0700 Subject: [PATCH 2/6] Bump version --- packages/video_player/video_player_android/CHANGELOG.md | 4 ++++ packages/video_player/video_player_android/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/video_player/video_player_android/CHANGELOG.md b/packages/video_player/video_player_android/CHANGELOG.md index 28d0188213d6..b090fb437e58 100644 --- a/packages/video_player/video_player_android/CHANGELOG.md +++ b/packages/video_player/video_player_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.3.5 + +* Updates exoplayer-dash to 2.18.1. + ## 2.3.4 * Updates ExoPlayer to 2.17.1. diff --git a/packages/video_player/video_player_android/pubspec.yaml b/packages/video_player/video_player_android/pubspec.yaml index 7e23b3210859..71c67372d7fc 100644 --- a/packages/video_player/video_player_android/pubspec.yaml +++ b/packages/video_player/video_player_android/pubspec.yaml @@ -2,7 +2,7 @@ name: video_player_android description: Android implementation of the video_player plugin. repository: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22 -version: 2.3.4 +version: 2.3.5 environment: sdk: ">=2.14.0 <3.0.0" From 7442511dc77032060b737aa43b2ce911f7b2ccb2 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 27 Jul 2022 15:23:47 -0700 Subject: [PATCH 3/6] Remove merge line --- packages/video_player/video_player_android/android/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 0faf78f1c043..711324ed8f26 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -51,7 +51,6 @@ android { testImplementation 'androidx.test:core:1.3.0' testImplementation 'org.mockito:mockito-inline:4.6.1' testImplementation 'org.robolectric:robolectric:4.8.1' - upstream/main } From 0feb5dc0d4d3e4bd64e9a492eee912b124143179 Mon Sep 17 00:00:00 2001 From: camsim99 Date: Wed, 27 Jul 2022 15:24:06 -0700 Subject: [PATCH 4/6] Remove merge space --- packages/video_player/video_player_android/android/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 711324ed8f26..92cedbed6c91 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -53,7 +53,6 @@ android { testImplementation 'org.robolectric:robolectric:4.8.1' } - testOptions { unitTests.includeAndroidResources = true unitTests.returnDefaultValues = true From 61aeb79adac7678c57651c52b1c44107052849d6 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Tue, 16 Aug 2022 12:08:19 -0400 Subject: [PATCH 5/6] Update all of exoplayer --- .../video_player/video_player_android/android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 92cedbed6c91..81d36fc72ee2 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -43,10 +43,10 @@ android { } dependencies { - implementation 'com.google.android.exoplayer:exoplayer-core:2.18.0' - implementation 'com.google.android.exoplayer:exoplayer-hls:2.18.0' + implementation 'com.google.android.exoplayer:exoplayer-core:2.18.1' + implementation 'com.google.android.exoplayer:exoplayer-hls:2.18.1' implementation 'com.google.android.exoplayer:exoplayer-dash:2.18.1' - implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.18.0' + implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.18.1' testImplementation 'junit:junit:4.13.2' testImplementation 'androidx.test:core:1.3.0' testImplementation 'org.mockito:mockito-inline:4.6.1' From 9efaa2f55be2e4c4c7b78c603478f8a443f215f2 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Tue, 16 Aug 2022 12:08:41 -0400 Subject: [PATCH 6/6] Tweak CHANGELOG --- packages/video_player/video_player_android/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/video_player/video_player_android/CHANGELOG.md b/packages/video_player/video_player_android/CHANGELOG.md index 3bb352ee785f..8512db5f87b2 100644 --- a/packages/video_player/video_player_android/CHANGELOG.md +++ b/packages/video_player/video_player_android/CHANGELOG.md @@ -1,6 +1,6 @@ ## 2.3.9 -* Updates exoplayer-dash to 2.18.1. +* Updates ExoPlayer to 2.18.1. ## 2.3.8