From 2cf339e0953fd00bbd2b664ff1770464f33bebc8 Mon Sep 17 00:00:00 2001 From: olly Date: Wed, 5 Oct 2016 11:56:24 -0700 Subject: [PATCH] Bump version to 2.0.2 + document inclusion of OkHttp extension ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=135260806 --- README.md | 27 ------------------- RELEASENOTES.md | 10 +++++++ build.gradle | 2 +- demo/src/main/AndroidManifest.xml | 4 +-- extensions/okhttp/README.md | 25 +++++++++++++++-- .../exoplayer2/ExoPlayerLibraryInfo.java | 4 +-- playbacktests/src/main/AndroidManifest.xml | 4 +-- 7 files changed, 40 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index f9c422db5e..f74cda84ee 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,6 @@ and extend, and can be updated through Play Store application updates. ## Using ExoPlayer ## -#### Via jCenter #### - The easiest way to get started using ExoPlayer is to add it as a gradle dependency. You need to make sure you have the jcenter repository included in the `build.gradle` file in the root of your project: @@ -44,31 +42,6 @@ project's [Releases][]. For more details, see the project on [Bintray][]. [Releases]: https://github.com/google/ExoPlayer/releases [Bintray]: https://bintray.com/google/exoplayer/exoplayer/view -#### As source #### - -ExoPlayer can also be built from source using Gradle. You can include it as a -dependent project like so: - -```gradle -// settings.gradle -include ':app', ':..:ExoPlayer:library' - -// app/build.gradle -dependencies { - compile project(':..:ExoPlayer:library') -} -``` - -#### As a jar #### - -If you want to use ExoPlayer as a jar, run: - -```sh -./gradlew jarRelease -``` - -and copy `library.jar` to the libs folder of your new project. - ## Developing ExoPlayer ## #### Project branches #### diff --git a/RELEASENOTES.md b/RELEASENOTES.md index d53d153912..f2ab674102 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,5 +1,15 @@ # Release notes # +### r2.0.2 ### + +* Fixes for MergingMediaSource and sideloaded subtitles. + ([#1882](https://github.com/google/ExoPlayer/issues/1882), + [#1854](https://github.com/google/ExoPlayer/issues/1854)). +* Reduced effect of application code leaking player references + ([#1855](https://github.com/google/ExoPlayer/issues/1855)). +* Initial support for fragmented MP4 in HLS. +* Misc bug fixes and minor features. + ### r2.0.1 ### * Fix playback of short duration content diff --git a/build.gradle b/build.gradle index 559dec69ec..7a76fc92c3 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ allprojects { releaseRepoName = 'exoplayer' releaseUserOrg = 'google' releaseGroupId = 'com.google.android.exoplayer' - releaseVersion = 'r2.0.1' + releaseVersion = 'r2.0.2' releaseWebsite = 'https://github.com/google/ExoPlayer' } } diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index b270b1410f..1bba067c70 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -16,8 +16,8 @@ + android:versionCode="2002" + android:versionName="2.0.2"> diff --git a/extensions/okhttp/README.md b/extensions/okhttp/README.md index 06cd324be2..d84dcb44ec 100644 --- a/extensions/okhttp/README.md +++ b/extensions/okhttp/README.md @@ -2,8 +2,29 @@ ## Description ## -The OkHttp Extension is an [HttpDataSource][] implementation using Square's [OkHttp][]. +The OkHttp Extension is an [HttpDataSource][] implementation using Square's +[OkHttp][]. + +## Using the extension ## + +The easiest way to use the extension is to add it as a gradle dependency. You +need to make sure you have the jcenter repository included in the `build.gradle` +file in the root of your project: + +```gradle +repositories { + jcenter() +} +``` + +Next, include the following in your module's `build.gradle` file: + +```gradle +compile 'com.google.android.exoplayer:extension-okhttp:rX.X.X' +``` + +where `rX.X.X` is the version, which must match the version of the ExoPlayer +library being used. [HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html [OkHttp]: https://square.github.io/okhttp/ - diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java index 1e95372730..9e212ba2f6 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java @@ -23,7 +23,7 @@ public interface ExoPlayerLibraryInfo { /** * The version of the library, expressed as a string. */ - String VERSION = "2.0.1"; + String VERSION = "2.0.2"; /** * The version of the library, expressed as an integer. @@ -32,7 +32,7 @@ public interface ExoPlayerLibraryInfo { * corresponding integer version 1002003 (001-002-003), and "123.45.6" has the corresponding * integer version 123045006 (123-045-006). */ - int VERSION_INT = 2000001; + int VERSION_INT = 2000002; /** * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions} diff --git a/playbacktests/src/main/AndroidManifest.xml b/playbacktests/src/main/AndroidManifest.xml index 7dde5b65f8..cd13b96b90 100644 --- a/playbacktests/src/main/AndroidManifest.xml +++ b/playbacktests/src/main/AndroidManifest.xml @@ -17,8 +17,8 @@ + android:versionCode="2002" + android:versionName="2.0.2">