Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Nebula Plugin and Gradle #118

Merged
merged 2 commits into from
Jan 3, 2015
Merged

Upgrade Nebula Plugin and Gradle #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
367d4d2
Upgrade to Nebula 2.x and gradle-rxjava-project-plugin 2.x
benjchristensen Jan 3, 2015
a1c2dca
Disable sample-app
benjchristensen Jan 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.gradle
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ rootProject.name='rxandroid-root'

include 'rxandroid'
include 'rxandroid-framework'
include 'sample-app'
//include 'sample-app'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, intentional to try and get 0.24 released until we can figure out how to have the sample-app working with the latest build plugin.