convert to use new dependency and java gradle plugin

Author: Traun Leyden

Diff for: build.gradle

@@ -6,7 +6,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:0.8.+'
     }
 }
-apply plugin: 'android-library'
+apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'eclipse'
 
@@ -20,20 +20,6 @@ repositories {
 apply from: 'dependencies-test.gradle'       // <- enable this when testing
 
 
-android {
-    compileSdkVersion 19
-    buildToolsVersion "19.0.0"
-
-    defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 19
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-}
-
 task createMavenDirectory(type: Exec) {
 
     ext {
@@ -72,11 +58,3 @@ uploadArchives {
     }
 }
 
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.srcDirs
-}
-
-task generateJavadocs(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-}

Diff for: dependencies-archive.gradle

@@ -1,6 +1,5 @@
 dependencies {
 
-    compile 'com.android.support:support-v4:13.0.+'
 
     // the cblite core library dependency is included as a maven archive because when declaring
     // as a "compile project" dependency any projects that include this library will get errors.

Diff for: dependencies-test.gradle

@@ -1,14 +1,12 @@
 dependencies {
 
-    compile 'com.android.support:support-v4:13.0.+'
-
-    compile project(':CBLite')
+    compile project(':libraries:couchbase-lite-java-core')
 
     // as discovered by trial and error, the build will fail if "compile" is
     // used: Error: duplicate files during packaging of APK.  I guess it is
     // being implicitly included by being in the libs folder, and then "double included"
     // because of a "compile" directive to explicitly include the jar.
-    instrumentTestCompile fileTree(dir: 'libs', include: 'td_collator_so.jar')
+    testCompile fileTree(dir: 'libs', include: 'td_collator_so.jar')
 
     compile 'org.mozilla:rhino:1.7R3'
 

Diff for: settings.gradle

@@ -0,0 +1 @@
+include ':couchbase-lite-java-javascript', ':libraries:couchbase-lite-java-core'