Skip to content

Clean merge of rxjava-async-util #706

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

Closed
benjchristensen wants to merge 8 commits into from
Closed

Clean merge of rxjava-async-util #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dda3b79
New contrib module: rxjava-async-util
benjchristensen Dec 27, 2013
0d5201e
Merge with master, added future operators
akarnokd Dec 28, 2013
16ea504
New contrib module: rxjava-async-util
benjchristensen Dec 27, 2013
1193dd1
Manual merge of https://github.com/akarnokd/RxJava/commit/eee312a6ac4…
benjchristensen Dec 30, 2013
def48d8
New contrib module: rxjava-async-util
benjchristensen Dec 27, 2013
f59d59a
Manual merge of https://github.com/akarnokd/RxJava/commit/eee312a6ac4…
benjchristensen Dec 30, 2013
210a4bb
New contrib module: rxjava-async-util
benjchristensen Dec 27, 2013
b7c3912
Manual merge of https://github.com/akarnokd/RxJava/commit/eee312a6ac4…
benjchristensen Dec 30, 2013
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
20 changes: 20 additions & 0 deletions rxjava-contrib/rxjava-async-util/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
apply plugin: 'osgi'

sourceCompatibility = JavaVersion.VERSION_1_6
targetCompatibility = JavaVersion.VERSION_1_6

dependencies {
compile project(':rxjava-core')
testCompile project(":rxjava-core").sourceSets.test.output
provided 'junit:junit-dep:4.10'
provided 'org.mockito:mockito-core:1.8.5'
}

jar {
manifest {
name = 'rxjava-async-util'
instruction 'Bundle-Vendor', 'Netflix'
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'
}
}
Loading