diff --git a/build.gradle b/build.gradle index 21e65dce..f6ce97bb 100644 --- a/build.gradle +++ b/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 { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0087cd3b..c97a8bdb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 61e8d106..21bf8569 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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