diff --git a/build.gradle b/build.gradle
index 68d066ea65..fb8f3092c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.+'
+        classpath 'com.android.tools.build:gradle:1.0.0-rc1'
     }
 }
 
diff --git a/demo/build.gradle b/demo/build.gradle
index 91a06b8b07..0a530c8609 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -15,7 +15,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "19.1"
+    buildToolsVersion "21.1.1"
 
     defaultConfig {
         minSdkVersion 16
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index f590303052..ee2f978324 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="1013"
-    android:versionName="1.0.13"
+    android:versionCode="1100"
+    android:versionName="1.1.00"
     android:theme="@style/RootTheme">
 
   <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/library/build.gradle b/library/build.gradle
index 8ccf3cfaca..8256b871f5 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -15,7 +15,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "19.1"
+    buildToolsVersion "21.1.1"
 
     defaultConfig {
         minSdkVersion 9
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 cc3265d18a..6fb7d20be8 100644
--- a/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java
+++ b/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java
@@ -26,15 +26,15 @@ public class ExoPlayerLibraryInfo {
   /**
    * The version of the library, expressed as a string.
    */
-  public static final String VERSION = "1.0.13";
+  public static final String VERSION = "1.1.0";
 
   /**
    * The version of the library, expressed as an integer.
    * <p>
    * Three digits are used for each component of {@link #VERSION}. For example "1.2.3" has the
-   * corresponding integer version 1002003.
+   * corresponding integer version 001002003.
    */
-  public static final int VERSION_INT = 1000013;
+  public static final int VERSION_INT = 001001000;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer.util.Assertions}