Permalink
Browse files

Merge pull request #9 from thomasnield/0.x

Got successful build while maintaining Nebula usage. Now just have to fix failing unit test.
  • Loading branch information...
2 parents 64e20cc + c7822ac commit 487c80a862feb144e200926fe5f7cad75826fa99 @thomasnield thomasnield committed Jan 9, 2016
Showing with 15 additions and 6 deletions.
  1. +14 −5 build.gradle
  2. +1 −1 gradle/wrapper/gradle-wrapper.properties
View
@@ -1,16 +1,25 @@
buildscript {
- repositories { jcenter() }
- dependencies { classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:1.12.+' }
+ repositories { jcenter() }
}
-apply plugin: 'rxjava-project'
+plugins {
+ id 'nebula.rxjava-project' version '3.0.0'
+}
+
+apply plugin: 'nebula.rxjava-project'
+apply plugin: 'java'
+
+task wrapper(type: Wrapper) {
+ gradleVersion = '2.8'
+ distributionUrl = 'https://services.gradle.org/distributions/gradle-2.8-all.zip'
+}
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
dependencies {
- compile 'io.reactivex:rxjava:1.0.0'
- testCompile 'junit:junit-dep:4.10'
+ compile 'io.reactivex:rxjava:1.0.+'
+ testCompile 'junit:junit-dep:4.+'
testCompile 'org.mockito:mockito-core:1.8.5'
}
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.8-all.zip

0 comments on commit 487c80a

Please sign in to comment.