commit df1e6ab408c12b3254ffa8f4b706c9ee99d61bf1
author Narayan Kamath <narayan@google.com> Mon Feb 10 13:20:03 2014 +0000
committer Narayan Kamath <narayan@google.com> Mon Feb 10 13:24:37 2014 +0000
tree 25951f62aa5f6dd5a6a0dfd6599225e909cc42a0
parent f30738e41ac44c2db3552798392d7f2db04b3451
parent 6c78e499ac77a4e62ff5092c039f403d6685aae5

resolved conflicts for merge of 6c78e499 to master

Change-Id: If2a1d6d8b7be71f450310ffa3c0cc9b35b563a02

build.gradle

diff --git a/build.gradle b/build.gradle
index ab168af..c250dbf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,16 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.8.+'
+    }
+}
+
 apply plugin: 'android-library'
 
 android {
-    compileSdkVersion 17
+    compileSdkVersion 19
     buildToolsVersion = '19.0.1'
 
     sourceSets {
@@ -20,12 +29,8 @@
 
         }
 
-        instrumentTest {
-            assets.srcDirs    = ["tests/assets"]
-            res.srcDirs       = ["tests/res"]
-            resources.srcDirs = ["tests/src"]
-            java.srcDirs      = ["tests/src"]
-        }
+        instrumentTest.setRoot('tests')
+        instrumentTest.java.srcDirs = ['tests/src']
     }
     lintOptions {
         // TODO: fix errors and reenable.