Skip to content

Commit 306ae92

Browse files
akarnokdviktorklang
authored andcommitted
Bridge between Reactive-Streams and JDK 9 Flow API (#296)
* Bridge between Reactive-Streams and JDK 9 Flow API * Apply changes based on ktoso's feedback * Use oraclejdk9, resolve build.gradle conflict * Change txt/code to use "Reactive Streams" as designator * NPE to use the updated parameter name. * Rename bridge class, tester class (+javadoc)
1 parent dd24d2a commit 306ae92

File tree

14 files changed

+1119
-15
lines changed

14 files changed

+1119
-15
lines changed

.travis.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,29 @@
11
language: java
22
sudo: required
3+
dist: trusty
4+
#group: edge
5+
36
script:
47
- ./gradlew check
58
cache:
69
directories:
710
- $HOME/.gradle
8-
jdk:
9-
- oraclejdk8
10-
- openjdk6
11+
12+
before_install:
13+
- export GRADLE_OPTS=-Xmx1024m
14+
15+
matrix:
16+
include:
17+
- jdk: openjdk7
18+
- jdk: oraclejdk8 # JDK 1.8.0_131-b11
19+
- jdk: oraclejdk9
20+
21+
# Don't let Travis CI execute './gradlew assemble' by default
22+
# From https://github.com/reactive-streams/reactive-streams-jvm/pull/383
23+
install:
24+
# Display Gradle, JVM and other versions
25+
- ./gradlew -version
26+
1127
env:
1228
global:
1329
- TERM=dumb

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ subprojects {
4646
}
4747
}
4848

49-
if (name in ["reactive-streams", "reactive-streams-tck", "reactive-streams-examples"]) {
49+
if (name in ["reactive-streams", "reactive-streams-tck", "reactive-streams-examples", "reactive-streams-flow-bridge"]) {
5050
apply plugin: "maven"
5151
apply plugin: "signing"
5252

flow-bridge/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin

flow-bridge/build.gradle

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
description = 'reactive-streams-flow-bridge'
2+
3+
dependencies {
4+
compile project(':reactive-streams')
5+
6+
testCompile project(':reactive-streams-tck')
7+
testCompile group: 'org.testng', name: 'testng', version: '5.14.10'
8+
}
9+
test.useTestNG()
10+
11+
javadoc {
12+
options.links("http://download.java.net/java/jdk9/docs/api")
13+
}

0 commit comments

Comments
 (0)