mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-23 15:38:50 -05:00
Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12
This commit is contained in:
parent
de6fe46eca
commit
cb3c2b2008
@ -1,12 +1,12 @@
|
||||
apply plugin: 'android'
|
||||
apply plugin: 'android-test'
|
||||
//apply plugin: 'android-test'
|
||||
|
||||
sourceSets {
|
||||
androidTest {
|
||||
java.srcDir file('src/test/java')
|
||||
//androidTest {
|
||||
//java.srcDir file('src/test/java')
|
||||
// configure the set of classes for JUnit tests
|
||||
// include '**/*Test.class'
|
||||
}
|
||||
//}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
@ -5,8 +5,8 @@ buildscript {
|
||||
|
||||
dependencies {
|
||||
// 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 'org.robolectric.gradle:gradle-android-test-plugin:0.10.0'
|
||||
classpath 'com.android.tools.build:gradle:0.11.1'
|
||||
//classpath 'org.robolectric.gradle:gradle-android-test-plugin:0.10.0'
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,5 +17,5 @@ allprojects {
|
||||
}
|
||||
|
||||
task wrapper(type: Wrapper) {
|
||||
gradleVersion = '1.10'
|
||||
gradleVersion = '1.12'
|
||||
}
|
||||
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
#Thu Mar 06 22:23:44 CET 2014
|
||||
#Mon Jun 09 22:04:23 CEST 2014
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user