PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12

Browse source
This commit is contained in:
Dominik Schürmann 2014-06-09 22:09:30 +02:00
parent de6fe46eca
commit cb3c2b2008
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OpenKeychain/build.gradle
View file

@ -1,12 +1,12 @@
apply plugin: 'android' apply plugin: 'android'
apply plugin: 'android-test' //apply plugin: 'android-test'
sourceSets { sourceSets {
androidTest { //androidTest {
java.srcDir file('src/test/java') //java.srcDir file('src/test/java')
// configure the set of classes for JUnit tests // configure the set of classes for JUnit tests
// include '**/*Test.class' // include '**/*Test.class'
} //}
} }
dependencies { dependencies {

6
build.gradle
View file

@ -5,8 +5,8 @@ buildscript {
dependencies { dependencies {
// NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
classpath 'com.android.tools.build:gradle:0.10.0' classpath 'com.android.tools.build:gradle:0.11.1'
classpath 'org.robolectric.gradle:gradle-android-test-plugin:0.10.0' //classpath 'org.robolectric.gradle:gradle-android-test-plugin:0.10.0'
} }
} }
@ -17,5 +17,5 @@ allprojects {
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '1.10' gradleVersion = '1.12'
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Thu Mar 06 22:23:44 CET 2014 #Mon Jun 09 22:04:23 CEST 2014
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip