Cleaned build scripts.
This commit is contained in:
parent
925eb2d5c5
commit
49293e259e
|
@ -11,21 +11,16 @@ buildscript {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
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'
|
compile 'com.android.support:multidex:1.0.1'
|
||||||
androidTestCompile 'com.android.support:multidex-instrumentation:1.0.1',
|
androidTestCompile 'com.android.support:multidex-instrumentation:1.0.1',
|
||||||
{ exclude module: 'multidex' }
|
{ exclude module: 'multidex' }
|
||||||
androidTestCompile project(path: ':core', configuration: 'testArtifacts')
|
|
||||||
compile 'org.scala-lang:scala-library:2.11.7'
|
compile 'org.scala-lang:scala-library:2.11.7'
|
||||||
compile 'com.google.guava:guava:18.0'
|
compile 'com.google.guava:guava:18.0'
|
||||||
compile 'com.mobsandgeeks:adapter-kit:0.5.3'
|
compile 'com.mobsandgeeks:adapter-kit:0.5.3'
|
||||||
compile project(path: ':core')
|
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.
|
// RtlHardcoded behaviour differs between target API versions. We only care about API 15.
|
||||||
preBuild.doFirst {
|
preBuild.doFirst {
|
||||||
android.applicationVariants.each { variant ->
|
android.applicationVariants.each { variant ->
|
||||||
|
|
|
@ -3,21 +3,8 @@ apply plugin: 'scala'
|
||||||
dependencies {
|
dependencies {
|
||||||
compile 'org.scala-lang:scala-library:2.11.7'
|
compile 'org.scala-lang:scala-library:2.11.7'
|
||||||
testCompile 'junit:junit:4.12'
|
testCompile 'junit:junit:4.12'
|
||||||
testCompile 'commons-io:commons-io:2.4'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
systemProperty "testDir", new File(buildDir, "/test/").toString()
|
systemProperty "testDir", new File(buildDir, "/test/").toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
task myTestsJar(type: Jar) {
|
|
||||||
from sourceSets.test.output, sourceSets.main.output
|
|
||||||
}
|
|
||||||
|
|
||||||
configurations {
|
|
||||||
testArtifacts
|
|
||||||
}
|
|
||||||
|
|
||||||
artifacts {
|
|
||||||
testArtifacts myTestsJar
|
|
||||||
}
|
|
||||||
|
|
Reference in New Issue