From 427cb34aca0b0252ed429961f1014550cf3399e0 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 28 Sep 2015 20:56:28 +0100
Subject: [PATCH] Bump version to 1.5.0

---
 RELEASENOTES.md                                           | 8 +++++---
 demo/src/main/AndroidManifest.xml                         | 4 ++--
 demo_misc/webm_sw_decoder/src/main/AndroidManifest.xml    | 4 ++--
 library/build.gradle                                      | 2 +-
 .../google/android/exoplayer/ExoPlayerLibraryInfo.java    | 4 ++--
 playbacktests/src/main/AndroidManifest.xml                | 4 ++--
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bac83d6084..c906dcc1ae 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,12 +1,14 @@
 # Release notes #
 
-### Current dev branch (from r1.4.2) ###
+### r.1.5.0 ###
 
 * Multi-track support.
 * DASH: Limited support for multi-period manifests.
 * HLS: Smoother format adaptation.
+* HLS: Support for MP3 media segments.
 * TTML: Support for most embedded TTML styling.
-* Playback tests.
+* WebVTT: Enhanced positioning support.
+* Initial playback tests.
 * Misc bug fixes.
 
 ### r1.4.2 ###
@@ -25,7 +27,7 @@
 * Support for extracting Matroska streams (implemented by WebmExtractor).
 * Support for tx3g captions in MP4 streams.
 * Support for H.265 in MPEG-TS streams on supported devices.
-* HLS: Added support for MPEG audio (e.g. MP3).
+* HLS: Added support for MPEG audio (e.g. MP3) in TS media segments.
 * HLS: Improved robustness against missing chunks and variants.
 * MP4: Added support for embedded MPEG audio (e.g. MP3).
 * TTML: Improved handling of whitespace.
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index 5212346bab..1575a1e6b7 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer.demo"
-    android:versionCode="1402"
-    android:versionName="1.4.2"
+    android:versionCode="1500"
+    android:versionName="1.5.0"
     android:theme="@style/RootTheme">
 
   <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/demo_misc/webm_sw_decoder/src/main/AndroidManifest.xml b/demo_misc/webm_sw_decoder/src/main/AndroidManifest.xml
index e07f7f34bc..72070a4162 100644
--- a/demo_misc/webm_sw_decoder/src/main/AndroidManifest.xml
+++ b/demo_misc/webm_sw_decoder/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer.demo.webm"
-    android:versionCode="1402"
-    android:versionName="1.4.2"
+    android:versionCode="1500"
+    android:versionName="1.5.0"
     android:theme="@style/RootTheme">
 
   <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/library/build.gradle b/library/build.gradle
index 4ed58a5b5f..257c5b4a34 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -77,7 +77,7 @@ publish {
     userOrg = 'google'
     groupId = 'com.google.android.exoplayer'
     artifactId = 'exoplayer'
-    version = 'r1.4.2'
+    version = 'r1.5.0'
     description = 'The ExoPlayer library.'
     website = 'https://github.com/google/ExoPlayer'
 }
diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java b/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java
index 1d3ae0c6be..1265fd43e1 100644
--- a/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java
+++ b/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java
@@ -23,7 +23,7 @@ public final class ExoPlayerLibraryInfo {
   /**
    * The version of the library, expressed as a string.
    */
-  public static final String VERSION = "1.4.2";
+  public static final String VERSION = "1.5.0";
 
   /**
    * The version of the library, expressed as an integer.
@@ -31,7 +31,7 @@ public final class ExoPlayerLibraryInfo {
    * Three digits are used for each component of {@link #VERSION}. For example "1.2.3" has the
    * corresponding integer version 001002003.
    */
-  public static final int VERSION_INT = 001004002;
+    public static final int VERSION_INT = 001005000;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer.util.Assertions}
diff --git a/playbacktests/src/main/AndroidManifest.xml b/playbacktests/src/main/AndroidManifest.xml
index f9f51c4e6d..01165915c2 100644
--- a/playbacktests/src/main/AndroidManifest.xml
+++ b/playbacktests/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer.playbacktests"
-    android:versionCode="1401"
-    android:versionName="1.4.1">
+    android:versionCode="1500"
+    android:versionName="1.5.0">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>