From 59f21c8561e394b71ad2ed708a39eec564c11e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 8 Sep 2014 08:39:07 +0200
Subject: [PATCH] Fix gradle build by bumping plugin version

Also add tools:replace since it's now needed as part of the manifest merger
---
 AndroidManifest.xml | 4 +++-
 build.gradle        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d37ee01ea..3216f7bb4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -57,7 +57,9 @@
         android:description="@string/app_description"
         android:allowBackup="true"
         android:theme="@style/AppThemeDark"
-        android:supportsRtl="true" >
+        android:supportsRtl="true"
+        tools:replace="theme, icon, label"
+        >
 
         <provider
             android:authorities="org.fdroid.fdroid.data.AppProvider"
diff --git a/build.gradle b/build.gradle
index 031a0e8b4..0d4641a6c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:0.10.0'
+		classpath 'com.android.tools.build:gradle:0.12.2'
 	}
 }