From 0e756b0e71d99ba1b52174164ee6b5a74e0bcdfb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 9 Mar 2018 08:44:24 -0800
Subject: [PATCH] Centralize version and target sdk constants

We had these specified directly in AndroidManifest.xml due to
our internal build setup. This change makes our internal build
re-write AndroidManifest.xml to dynamically insert the required
values, meaning they no longer need specifying in each manifest.

Bonus 1: Internally built demo apps now include the CL number at
which they're built in the version name :).

Bonus 2: Removes lint warning that complains min/target SDK
values in the manifest are redundant.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=188489115
---
 constants.gradle                        | 6 ++++--
 demos/cast/build.gradle                 | 2 ++
 demos/cast/src/main/AndroidManifest.xml | 6 ++----
 demos/ima/build.gradle                  | 2 ++
 demos/main/build.gradle                 | 2 ++
 demos/main/src/main/AndroidManifest.xml | 6 ++----
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/constants.gradle b/constants.gradle
index b02e2d4c37..a32aa2e8ab 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -12,13 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 project.ext {
+    // ExoPlayer version and version code.
+    releaseVersion = '2.7.0'
+    releaseVersionCode = 2700
     // Important: ExoPlayer specifies a minSdkVersion of 14 because various
     // components provided by the library may be of use on older devices.
     // However, please note that the core media playback functionality provided
     // by the library requires API level 16 or greater.
     minSdkVersion = 14
-    compileSdkVersion = 27
     targetSdkVersion = 27
+    compileSdkVersion = 27
     buildToolsVersion = '26.0.2'
     testSupportLibraryVersion = '0.5'
     supportLibraryVersion = '27.0.0'
@@ -28,7 +31,6 @@ project.ext {
     junitVersion = '4.12'
     truthVersion = '0.39'
     robolectricVersion = '3.7.1'
-    releaseVersion = '2.7.0'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index 9bf62c8fc3..c928d0e46e 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -19,6 +19,8 @@ android {
     buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
+        versionName project.ext.releaseVersion
+        versionCode project.ext.releaseVersionCode
         minSdkVersion 16
         targetSdkVersion project.ext.targetSdkVersion
     }
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index d23576572a..ae16776333 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -14,12 +14,10 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer2.castdemo"
-    android:versionCode="2700"
-    android:versionName="2.7.0">
+    package="com.google.android.exoplayer2.castdemo">
 
   <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27"/>
+  <uses-sdk/>
 
   <application android:label="@string/application_name" android:icon="@mipmap/ic_launcher"
       android:largeHeap="true" android:allowBackup="false">
diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle
index 710e878d14..35c2daf88e 100644
--- a/demos/ima/build.gradle
+++ b/demos/ima/build.gradle
@@ -19,6 +19,8 @@ android {
     buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
+        versionName project.ext.releaseVersion
+        versionCode project.ext.releaseVersionCode
         minSdkVersion 16
         targetSdkVersion project.ext.targetSdkVersion
     }
diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index 5b199faf7a..ce0992eb7a 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -19,6 +19,8 @@ android {
     buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
+        versionName project.ext.releaseVersion
+        versionCode project.ext.releaseVersionCode
         minSdkVersion 16
         targetSdkVersion project.ext.targetSdkVersion
     }
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index a98176d93b..cde95300ab 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -15,15 +15,13 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer2.demo"
-    android:versionCode="2700"
-    android:versionName="2.7.0">
+    package="com.google.android.exoplayer2.demo">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-feature android:name="android.software.leanback" android:required="false"/>
   <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27"/>
+  <uses-sdk/>
 
   <application
       android:label="@string/application_name"