summaryrefslogtreecommitdiff
path: root/app/build.gradle
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-07-24 16:51:45 +0200
committerParménides GV <parmegv@sdf.org>2014-07-24 16:51:45 +0200
commit1dd922cf3c00bdee4625663e436286fa39e566e5 (patch)
tree211e8daff57c173035ea8b75eeff6f72f3f97ed1 /app/build.gradle
parent482c378c2ff3a37a76ed5788cf4eaef30a63d517 (diff)
parentb28eeb08e8ec3baafdd9388cc5b70c6c84db9cf1 (diff)
Merge branch 'develop'0.5.4
Diffstat (limited to 'app/build.gradle')
-rw-r--r--app/build.gradle10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 8c60eb0f..c4fdc44b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,13 +2,12 @@ apply plugin: 'android'
android {
compileSdkVersion 19
- buildToolsVersion "19.1.0"
+ buildToolsVersion "20"
defaultConfig {
minSdkVersion 14
targetSdkVersion 19
- testPackageName "se.leap.bitmaskclient.test"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
}
@@ -47,8 +46,9 @@ android {
}
dependencies {
- androidTestCompile 'com.android.support:support-v4:+'
- androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1'
+ // androidTestCompile 'com.android.support:support-v4:20+'
+ // androidTestCompile 'com.android.support:appcompat-v7:20.+'
+ androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.2.1'
compile 'com.intellij:annotations:12.0'
}
@@ -144,4 +144,4 @@ task mergeUntranslatable( type: Copy, dependsOn: 'removeDuplicatedStrings') {
delete ics_openvpn_untranslatable
}
-build.dependsOn ':app:mergeUntranslatable' \ No newline at end of file
+//build.dependsOn ':app:mergeUntranslatable' \ No newline at end of file