Skip to content

Commit 487c80a

Browse files
committed
Merge pull request #9 from thomasnield/0.x
Got successful build while maintaining Nebula usage. Now just have to fix failing unit test.
2 parents 64e20cc + c7822ac commit 487c80a

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

build.gradle

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
11
buildscript {
2-
repositories { jcenter() }
3-
dependencies { classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:1.12.+' }
2+
repositories { jcenter() }
43
}
54

6-
apply plugin: 'rxjava-project'
5+
plugins {
6+
id 'nebula.rxjava-project' version '3.0.0'
7+
}
8+
9+
apply plugin: 'nebula.rxjava-project'
10+
apply plugin: 'java'
11+
12+
task wrapper(type: Wrapper) {
13+
gradleVersion = '2.8'
14+
distributionUrl = 'https://services.gradle.org/distributions/gradle-2.8-all.zip'
15+
}
716

817
sourceCompatibility = JavaVersion.VERSION_1_8
918
targetCompatibility = JavaVersion.VERSION_1_8
1019

1120
dependencies {
12-
compile 'io.reactivex:rxjava:1.0.0'
13-
testCompile 'junit:junit-dep:4.10'
21+
compile 'io.reactivex:rxjava:1.0.+'
22+
testCompile 'junit:junit-dep:4.+'
1423
testCompile 'org.mockito:mockito-core:1.8.5'
1524
}
1625

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-2.8-all.zip

0 commit comments

Comments
 (0)