Update build-tools, adjust versioning scheme, add permission

microg · Feb 7, 2016 · 2fb4385 · 2fb4385
1 parent 932e544
commit 2fb4385
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,9 @@ script:
   - ./gradlew assembleDebug -x lint
 android:
   components:
-  - extra-android-m2repository
-  - build-tools-23.0.1
+  - tools
+  - build-tools-23.0.2
   - android-23
+  - extra-android-m2repository
 
 
diff --git a/services-framework-proxy/build.gradle b/services-framework-proxy/build.gradle
@@ -19,15 +19,38 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 
 apply plugin: 'com.android.application'
 
+String getMyVersionName() {
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'describe', '--tags', '--always', '--dirty'
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
+int getMyVersionCode() {
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'rev-list', '--count', "HEAD"
+        standardOutput = stdout
+    }
+    return Integer.parseInt(stdout.toString().trim())
+}
+
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
+
+    defaultConfig {
+        versionName getMyVersionName()
+        versionCode getMyVersionCode()
+    }
 }
 
 if (file('user.gradle').exists()) {

diff --git a/services-framework-proxy/src/main/AndroidManifest.xml b/services-framework-proxy/src/main/AndroidManifest.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.gsf"
-    android:versionCode="1"
-    android:versionName="0.0.1">
+<manifest package="com.google.android.gsf"
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-sdk
         android:minSdkVersion="10"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="23"/>
 
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
+    <uses-permission android:name="com.google.android.c2dm.permission.SEND"/>
 
     <application
         android:allowBackup="false"
@@ -19,10 +18,10 @@
             android:exported="true"
             android:permission="com.google.android.c2dm.permission.RECEIVE">
             <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.REGISTER" />
+                <action android:name="com.google.android.c2dm.intent.REGISTER"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.UNREGISTER" />
+                <action android:name="com.google.android.c2dm.intent.UNREGISTER"/>
             </intent-filter>
         </service>
     </application>