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

Bridge between Reactive-Streams and JDK 9 Flow API #296

Merged
merged 6 commits into from
Sep 30, 2017
Merged

Bridge between Reactive-Streams and JDK 9 Flow API #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53aba05
Bridge between Reactive-Streams and JDK 9 Flow API
akarnokd Jul 12, 2017
058b3a4
Apply changes based on ktoso's feedback
akarnokd Jul 13, 2017
29bc523
Use oraclejdk9, resolve build.gradle conflict
akarnokd Sep 22, 2017
4d842b7
Change txt/code to use "Reactive Streams" as designator
akarnokd Sep 22, 2017
2f9c9cf
NPE to use the updated parameter name.
akarnokd Sep 22, 2017
4239382
Rename bridge class, tester class (+javadoc)
akarnokd Sep 25, 2017
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
22 changes: 19 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
language: java
sudo: required
dist: trusty
#group: edge

script:
- ./gradlew check
cache:
directories:
- $HOME/.gradle
jdk:
- oraclejdk8
- openjdk6

before_install:
- export GRADLE_OPTS=-Xmx1024m

matrix:
include:
- jdk: openjdk7
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we may be OK not running against 6, but let's see what others say hm

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not much option here I think, JDK 6 is less and less supported by Gradle/Travis. As long as the compile target is 6, we should be okay.

Copy link
Contributor

Choose a reason for hiding this comment

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

👍

- jdk: oraclejdk8 # JDK 1.8.0_131-b11
- jdk: oraclejdk9

# Don't let Travis CI execute './gradlew assemble' by default
# From https://github.com/reactive-streams/reactive-streams-jvm/pull/383
install:
# Display Gradle, JVM and other versions
- ./gradlew -version

env:
global:
- TERM=dumb
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ subprojects {
instructionReplace "Bundle-Vendor", "Reactive Streams SIG"
instructionReplace "Bundle-Description", "Reactive Streams API"
instructionReplace "Bundle-DocURL", "http://reactive-streams.org"
instructionReplace "Bundle-Version", "1.0.1-RC2"
instructionReplace "Bundle-Version", "1.0.1"
}
}

if (name in ["reactive-streams", "reactive-streams-tck", "reactive-streams-examples"]) {
if (name in ["reactive-streams", "reactive-streams-tck", "reactive-streams-examples", "reactive-streams-flow-bridge"]) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Not to start a bikeshedding exercise, but are we on board with the naming of this artifact?

Options are things like "reactive-streams-flow-compat", "reactive-streams-jdk9-compat", "reactive-streams-jdk9-interop" and the like.

Copy link
Contributor

Choose a reason for hiding this comment

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

Heh yeah did not want to open that bikeshed as I've bikeshedded quite a lot here already.
Only precedent for such a library would be the https://github.com/scala/scala-java8-compat library I think, and the inclusion of the number there perhaps is sub optimal. So out of the ones you proposed I like reactive-streams-flow-compat I guess, or reactive-streams-java-flow-compat.

It's not super important to me though I guess, so would be interesting to hear or do a quick vote I guess?

Copy link
Contributor

Choose a reason for hiding this comment

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

How about reactive-streams-jsr266-interop?

apply plugin: "maven"
apply plugin: "signing"

Expand Down
1 change: 1 addition & 0 deletions flow-bridge/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin
13 changes: 13 additions & 0 deletions flow-bridge/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
description = 'reactive-streams-flow-bridge'

dependencies {
compile project(':reactive-streams')

testCompile project(':reactive-streams-tck')
testCompile group: 'org.testng', name: 'testng', version: '5.14.10'
}
test.useTestNG()

javadoc {
options.links("http://download.java.net/java/jdk9/docs/api")
}
Loading