Cleaned build scripts.

android/build.gradle

@@ -11,21 +11,16 @@ buildscript {
 }
 
 dependencies {
-    compile "com.android.support:appcompat-v7:23.0.0"
+    compile 'com.android.support:design:23.1.1'
-    compile 'com.android.support:design:23.0.0'
     compile 'com.android.support:multidex:1.0.1'
     androidTestCompile 'com.android.support:multidex-instrumentation:1.0.1',
                        { exclude module: 'multidex' }
-    androidTestCompile project(path: ':core', configuration: 'testArtifacts')
     compile 'org.scala-lang:scala-library:2.11.7'
     compile 'com.google.guava:guava:18.0'
     compile 'com.mobsandgeeks:adapter-kit:0.5.3'
     compile project(path: ':core')
 }
 
-// TODO: need to import core test classes
-//assembleAndroidTest.dependsOn tasks.getByPath(':core:testClasses')
-
 // RtlHardcoded behaviour differs between target API versions. We only care about API 15.
 preBuild.doFirst {
     android.applicationVariants.each { variant ->

core/build.gradle

@@ -3,21 +3,8 @@ apply plugin: 'scala'
 dependencies {
     compile 'org.scala-lang:scala-library:2.11.7'
     testCompile 'junit:junit:4.12'
-    testCompile 'commons-io:commons-io:2.4'
 }
 
 test {
     systemProperty "testDir", new File(buildDir, "/test/").toString()
 }
-
-task myTestsJar(type: Jar) {
-    from sourceSets.test.output, sourceSets.main.output
-}
-
-configurations {
-    testArtifacts
-}
-
-artifacts {
-    testArtifacts myTestsJar
-}