Merge pull request #166 from google/dev

dev -> dev-hls

build.gradle

@@ -19,7 +19,7 @@ buildscript {
         mavenCentral()
         mavenCentral()
     }
     }
     dependencies {
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:0.14.+'
     }
     }
 }
 }
 
 

demo/build.gradle

@@ -11,10 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // limitations under the License.
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 
 android {
 android {
-    compileSdkVersion 19
+    compileSdkVersion 21
     buildToolsVersion "19.1"
     buildToolsVersion "19.1"
 
 
     defaultConfig {
     defaultConfig {
@@ -23,7 +23,7 @@ android {
     }
     }
     buildTypes {
     buildTypes {
         release {
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
         }
     }
     }

gradle/wrapper/gradle-wrapper.properties

-#Tue Jun 10 20:02:28 BST 2014
+#Thu Nov 20 12:15:03 PST 2014
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-rc-1-bin.zip

library/.project~

-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ExoPlayerLib</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1363908161147</id>
-			<name></name>
-			<type>22</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-BUILD</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1363908161148</id>
-			<name></name>
-			<type>10</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-true-false-build</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>

library/build.gradle

@@ -11,10 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // limitations under the License.
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 
 
 android {
 android {
-    compileSdkVersion 19
+    compileSdkVersion 21
     buildToolsVersion "19.1"
     buildToolsVersion "19.1"
 
 
     defaultConfig {
     defaultConfig {
@@ -24,7 +24,7 @@ android {
 
 
     buildTypes {
     buildTypes {
         release {
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
         }
     }
     }