Merge pull request #48 from novoda/fix_build

Move tests and demos to Gradle

Author: Xavi Rigau

acceptance/lint.xml

@@ -14,10 +14,9 @@ buildscript {
 android {
     compileSdkVersion 22
     buildToolsVersion "22.0.1"
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-        }
+
+    defaultConfig {
+        minSdkVersion 8
     }
 }
 
@@ -26,14 +25,11 @@ repositories {
 }
 
 dependencies {
-    testCompile "org.scala-lang:scala-library:2.9.1"
-    testCompile "org.scalatest:scalatest_2.9.1:1.8.RC1"
-    testCompile "junit:junit:4.10"
-    testCompile "com.pivotallabs:robolectric:1.1"
-    testCompile "com.novocode:junit-interface:0.8"
-    testCompile "org.mockito:mockito-core:1.9.0"
-    testCompile "com.google.android:android:4.0.1.2"
-    testCompile "com.google.android:android-test:4.0.1.2"
+    testCompile "junit:junit:4.12"
+    testCompile "org.robolectric:robolectric:2.4"
+    testCompile "org.mockito:mockito-core:1.9.5"
+    // make Robolectric work on Gradle 2.3
+    testCompile 'org.apache.maven:maven-ant-tasks:2.1.3'
 }
 
 publish {

acceptance/pom.xml

@@ -4,9 +4,6 @@
   android:versionCode="1"
   android:versionName="1.0" >
 
-  <uses-sdk
-    android:minSdkVersion="3"
-    android:targetSdkVersion="17" />
 
   <application android:allowBackup="false" >
     <uses-library android:name="android.test.runner" />
@@ -21,9 +18,4 @@
       android:exported="false" />
   </application>
 
-  <instrumentation
-    android:name="android.test.InstrumentationTestRunner"
-    android:label="Tests for sqliteprovider"
-    android:targetPackage="novoda.lib.sqliteprovider.tests" />
-
 </manifest>