From 8c49ba3b771e783677ab36fe12c742e04fe36245 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Tue, 20 Nov 2018 19:38:29 +0800 Subject: [PATCH 1/2] [video_player] ExoPlayer 2.9.1, Android 9, Demo fixes --- packages/video_player/CHANGELOG.md | 6 ++++++ packages/video_player/android/build.gradle | 18 ++++++++++++------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/app/build.gradle | 9 ++++++++- .../android/app/src/main/AndroidManifest.xml | 3 ++- .../main/res/xml/network_security_config.xml | 7 +++++++ .../video_player/example/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- packages/video_player/pubspec.yaml | 2 +- 9 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 packages/video_player/example/android/app/src/main/res/xml/network_security_config.xml diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md index 0b55c0fe7b01..9482a71ecfbf 100644 --- a/packages/video_player/CHANGELOG.md +++ b/packages/video_player/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.7.3 + +* Android: Upgrade ExoPlayer to 2.9.1 +* Android: Use current gradle dependencies +* Android 9 compatibility fixes for Demo App + ## 0.7.2 * Updated to use factories on exoplayer `MediaSource`s for Android instead of the now-deprecated constructors. diff --git a/packages/video_player/android/build.gradle b/packages/video_player/android/build.gradle index c6e627dcad11..1acfee7e4374 100644 --- a/packages/video_player/android/build.gradle +++ b/packages/video_player/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.1' } } @@ -22,7 +22,7 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 16 @@ -31,11 +31,17 @@ android { lintOptions { disable 'InvalidPackage' } + android { + compileOptions { + sourceCompatibility 1.8 + targetCompatibility 1.8 + } + } dependencies { - implementation 'com.google.android.exoplayer:exoplayer-core:2.8.0' - implementation 'com.google.android.exoplayer:exoplayer-hls:2.8.0' - implementation 'com.google.android.exoplayer:exoplayer-dash:2.8.0' - implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.8.0' + implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1' + implementation 'com.google.android.exoplayer:exoplayer-hls:2.9.1' + implementation 'com.google.android.exoplayer:exoplayer-dash:2.9.1' + implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.9.1' } } diff --git a/packages/video_player/android/gradle/wrapper/gradle-wrapper.properties b/packages/video_player/android/gradle/wrapper/gradle-wrapper.properties index fccc20c98944..9f96ce648a03 100644 --- a/packages/video_player/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/video_player/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/packages/video_player/example/android/app/build.gradle b/packages/video_player/example/android/app/build.gradle index 9309afc8dde1..a6ddbff61af8 100644 --- a/packages/video_player/example/android/app/build.gradle +++ b/packages/video_player/example/android/app/build.gradle @@ -15,7 +15,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 27 + compileSdkVersion 28 lintOptions { disable 'InvalidPackage' @@ -27,6 +27,13 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } + android { + compileOptions { + sourceCompatibility 1.8 + targetCompatibility 1.8 + } + } + buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/packages/video_player/example/android/app/src/main/AndroidManifest.xml b/packages/video_player/example/android/app/src/main/AndroidManifest.xml index 8e668935b036..914e82b3c894 100644 --- a/packages/video_player/example/android/app/src/main/AndroidManifest.xml +++ b/packages/video_player/example/android/app/src/main/AndroidManifest.xml @@ -6,7 +6,8 @@ + android:icon="@mipmap/ic_launcher" + android:networkSecurityConfig="@xml/network_security_config"> + + + www.sample-videos.com + 184.72.239.149 + + \ No newline at end of file diff --git a/packages/video_player/example/android/build.gradle b/packages/video_player/example/android/build.gradle index d4225c7905bc..bb8a303898ca 100644 --- a/packages/video_player/example/android/build.gradle +++ b/packages/video_player/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.1' } } diff --git a/packages/video_player/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/video_player/example/android/gradle/wrapper/gradle-wrapper.properties index 49166236986e..2819f022f1fd 100644 --- a/packages/video_player/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/video_player/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml index 293932f4620f..7a5d34f3754b 100644 --- a/packages/video_player/pubspec.yaml +++ b/packages/video_player/pubspec.yaml @@ -2,7 +2,7 @@ name: video_player description: Flutter plugin for displaying inline video with other Flutter widgets on Android and iOS. author: Flutter Team -version: 0.7.2 +version: 0.7.3 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player flutter: From 4d44a19b115489b8857d43c022ff7c8b321da996 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Wed, 21 Nov 2018 07:27:58 +0800 Subject: [PATCH 2/2] Mark version as 0.8.0, revert gradle wrapper changes (to be published in a separate PR) --- packages/video_player/CHANGELOG.md | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/video_player/pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md index 9482a71ecfbf..3ce24012c30e 100644 --- a/packages/video_player/CHANGELOG.md +++ b/packages/video_player/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.7.3 +## 0.8.0 * Android: Upgrade ExoPlayer to 2.9.1 * Android: Use current gradle dependencies diff --git a/packages/video_player/android/gradle/wrapper/gradle-wrapper.properties b/packages/video_player/android/gradle/wrapper/gradle-wrapper.properties index 9f96ce648a03..fccc20c98944 100644 --- a/packages/video_player/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/video_player/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip diff --git a/packages/video_player/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/video_player/example/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1fd..49166236986e 100644 --- a/packages/video_player/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/video_player/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml index 7a5d34f3754b..73d2890bb61b 100644 --- a/packages/video_player/pubspec.yaml +++ b/packages/video_player/pubspec.yaml @@ -2,7 +2,7 @@ name: video_player description: Flutter plugin for displaying inline video with other Flutter widgets on Android and iOS. author: Flutter Team -version: 0.7.3 +version: 0.8.0 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player flutter: