Bump Gradle to 2.12, Make explicit dependency on RxJava 1.1.3 (#149)

akarnokd · akarnokd · commit fa725e16027c · 2016-04-14T15:53:13.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,10 @@
 buildscript {
     repositories { jcenter() }
-    dependencies { classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:2.+' }
+    dependencies { classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:4.0.0' }
 }
 
 allprojects {
-    apply plugin: 'rxjava-project'
+    apply plugin: 'nebula.rxjava-project'
 }
 
 idea {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Dec 13 00:17:11 PST 2014
+#2016-04-14T15:43:00+0100
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
diff --git a/rxjava-reactive-streams/build.gradle b/rxjava-reactive-streams/build.gradle
@@ -3,7 +3,7 @@ description = "Adapter between RxJava and ReactiveStreams"
 apply plugin: 'java'
 
 dependencies {
-    compile 'io.reactivex:rxjava:1.0.+'
+    compile 'io.reactivex:rxjava:1.1.3'
     compile 'org.reactivestreams:reactive-streams:1.0.0'
     testCompile 'org.reactivestreams:reactive-streams-tck:1.0.0'
 }

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`repositories { jcenter() }`
`3`		`- dependencies { classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:2.+' }`
	`3`	`+ dependencies { classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:4.0.0' }`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`allprojects {`
`7`		`- apply plugin: 'rxjava-project'`
	`7`	`+ apply plugin: 'nebula.rxjava-project'`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`idea {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ description = "Adapter between RxJava and ReactiveStreams"`
`3`	`3`	`apply plugin: 'java'`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- compile 'io.reactivex:rxjava:1.0.+'`
	`6`	`+ compile 'io.reactivex:rxjava:1.1.3'`
`7`	`7`	`compile 'org.reactivestreams:reactive-streams:1.0.0'`
`8`	`8`	`testCompile 'org.reactivestreams:reactive-streams-tck:1.0.0'`
`9`	`9`	`}`