From 49293e259e9fa09b8cb8373fc2d932ec3d7f50fe Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Sat, 21 Nov 2015 21:29:14 +0100 Subject: [PATCH] Cleaned build scripts. --- android/build.gradle | 7 +------ core/build.gradle | 13 ------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 1910153..524cc37 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -11,21 +11,16 @@ buildscript { } dependencies { - compile "com.android.support:appcompat-v7:23.0.0" - compile 'com.android.support:design:23.0.0' + compile 'com.android.support:design:23.1.1' 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 -> diff --git a/core/build.gradle b/core/build.gradle index 2d6730e..032a0f9 100644 --- a/core/build.gradle +++ b/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 -}