Merge pull request ReactiveX#118 from ReactiveX/nebula-plugin-upgrade

Upgrade Nebula Plugin and Gradle

Author: benjchristensen

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
   repositories { jcenter() }
   dependencies {
-    classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:1.12.13'
-    classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.3'
+    classpath 'com.netflix.nebula:gradle-rxjava-project-plugin:2.+'
+    classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:2.+'
   }
   configurations.classpath.resolutionStrategy {
     // The above dependency will bring in guava, which then pollutes child projects
@@ -17,6 +17,7 @@ bintrayUpload.enabled = false
 def libraryModules = subprojects.findAll { it.name != 'sample-app' }
 configure(libraryModules) {
   apply plugin: 'rxjava-project'
+  apply plugin: 'java'
   apply plugin: 'provided-base'
 
   dependencies {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Wed Oct 22 12:19:29 CEST 2014
+#Sat Dec 13 00:15:28 PST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ rootProject.name='rxandroid-root'
 
 include 'rxandroid'
 include 'rxandroid-framework'
-include 'sample-app'
+//include 'sample-app'