Skip to content

Commit ac6d04b

Browse files
committed
Bump to Robolectric 2.3, make samples build under Studio 0.8.+
refs ReactiveX#1449
1 parent 254cac1 commit ac6d04b

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

rxjava-contrib/rxjava-android-samples/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:0.11.+'
8+
classpath 'com.android.tools.build:gradle:0.12.+'
99
}
1010
}
1111

rxjava-contrib/rxjava-android-samples/samples/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
apply plugin: 'android'
1+
apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 19
5-
buildToolsVersion "19.1.0"
5+
buildToolsVersion "20"
66

77
defaultConfig {
88
minSdkVersion 14

rxjava-contrib/rxjava-android/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ dependencies {
88
// testing
99
testCompile 'junit:junit-dep:4.10'
1010
testCompile 'org.mockito:mockito-core:1.8.5'
11-
testCompile 'org.robolectric:robolectric:2.2'
11+
testCompile('org.robolectric:robolectric:2.3') {
12+
exclude group: 'com.android.support'
13+
}
1214
}
1315

1416
javadoc {

0 commit comments

Comments
 (0)