|
@@ -7,7 +7,6 @@
|
|
|
|
|
|
buildscript {
|
|
buildscript {
|
|
repositories {
|
|
repositories {
|
|
- jcenter()
|
|
|
|
}
|
|
}
|
|
dependencies {
|
|
dependencies {
|
|
classpath 'com.android.tools.build:gradle:2.2.1'
|
|
classpath 'com.android.tools.build:gradle:2.2.1'
|
|
@@ -24,7 +23,6 @@ ext {
|
|
}
|
|
}
|
|
|
|
|
|
repositories {
|
|
repositories {
|
|
- jcenter()
|
|
|
|
maven { url "https://jitpack.io" }
|
|
maven { url "https://jitpack.io" }
|
|
|
|
|
|
flatDir {
|
|
flatDir {
|
|
@@ -43,6 +41,7 @@ dependencies {
|
|
compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
|
|
compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
|
|
compile 'com.getbase:floatingactionbutton:1.10.1'
|
|
compile 'com.getbase:floatingactionbutton:1.10.1'
|
|
|
|
|
|
|
|
+
|
|
/// dependencies for local unit tests
|
|
/// dependencies for local unit tests
|
|
testCompile 'junit:junit:4.12'
|
|
testCompile 'junit:junit:4.12'
|
|
testCompile 'org.mockito:mockito-core:1.10.19'
|
|
testCompile 'org.mockito:mockito-core:1.10.19'
|
|
@@ -65,6 +64,7 @@ dependencies {
|
|
// fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details
|
|
// fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details
|
|
androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"
|
|
androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}"
|
|
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
tasks.withType(Test) {
|
|
tasks.withType(Test) {
|
|
@@ -113,12 +113,14 @@ android {
|
|
assets.srcDirs = ['assets']
|
|
assets.srcDirs = ['assets']
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
// move whole local unit tests structure as a whole from src/test/* to test/*
|
|
// move whole local unit tests structure as a whole from src/test/* to test/*
|
|
test.setRoot('test')
|
|
test.setRoot('test')
|
|
|
|
|
|
// move whole instrumented tests structure as a whole from src/androidTest/* to androidTest/*
|
|
// move whole instrumented tests structure as a whole from src/androidTest/* to androidTest/*
|
|
androidTest.setRoot('androidTest')
|
|
androidTest.setRoot('androidTest')
|
|
|
|
|
|
|
|
+
|
|
// Move the build types to build-types/<type>
|
|
// Move the build types to build-types/<type>
|
|
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
|
|
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
|
|
// This moves them out of them default location under src/<type>/... which would
|
|
// This moves them out of them default location under src/<type>/... which would
|