Skip to content

Commit

Permalink
Upgrade to Nebula 2.x and gradle-rxjava-project-plugin 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
benjchristensen committed Jan 3, 2015
1 parent 0240c12 commit 367d4d2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 367d4d2

Please sign in to comment.