Skip to content

Commit fd50125

Browse files
committed
Bridge between Reactive-Streams and JDK 9 Flow API
1 parent d8dff1b commit fd50125

14 files changed

+1113
-17
lines changed

Diff for: .travis.yml

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,35 @@
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 # JDK 9-ea+174 provided by Travis will be replaced by 9+177 in "before_install"
20+
before_install:
21+
- cd ~
22+
- wget http://download.java.net/java/jdk9/archive/177/binaries/jdk-9+177_linux-x64_bin.tar.gz
23+
- tar -xzf jdk-9+177_linux-x64_bin.tar.gz
24+
- export JAVA_HOME=~/jdk-9
25+
- PATH=$JAVA_HOME/bin:$PATH
26+
- cd -
27+
28+
# Don't let Travis CI execute './gradlew assemble' by default
29+
install:
30+
# Display Gradle, JVM and other versions
31+
- ./gradlew -version
32+
1133
env:
1234
global:
1335
- TERM=dumb

Diff for: build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ subprojects {
33
apply plugin: "osgi"
44

55
group = "org.reactivestreams"
6-
version = "1.0.1-RC2"
6+
version = "1.0.0"
77

88
sourceCompatibility = 1.6
99
targetCompatibility = 1.6
@@ -42,11 +42,11 @@ subprojects {
4242
instructionReplace "Bundle-Vendor", "Reactive Streams SIG"
4343
instructionReplace "Bundle-Description", "Reactive Streams API"
4444
instructionReplace "Bundle-DocURL", "http://reactive-streams.org"
45-
instructionReplace "Bundle-Version", "1.0.1-RC2"
45+
instructionReplace "Bundle-Version", "1.0.0"
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

Diff for: flow-bridge/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin

Diff for: flow-bridge/build.gradle

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
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()

0 commit comments

Comments
 (0)