Skip to content

Commit dddbd3a

Browse files
committed
fix #96
Updates CONTRIBUTING.md with Gatekeeper SLAs =tck method names and fine-details in some specs improved =tck #128 TCK updated to reflect merged rules 2.13 and 2.14 Moves the examples out to its own sub-project and makes sure that they are compiled but not published. =tck #138 clarify docs on registerOnSubscribe Aims to clarify confusion about this method, as seen in #138 fix #96 fix #95 gradle build tool makes gradlew executable add inter dependency add ivy publish incubator plugin but using this url "${rootProject.buildDir}/repo" merge add example project add example project
1 parent 71f9379 commit dddbd3a

16 files changed

+397
-69
lines changed

.gitignore

+12
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,15 @@ target/
1313
.history
1414
.idea
1515
.idea_modules
16+
.gradle
17+
.settings
18+
bin
19+
build
20+
out
21+
*.iml
22+
*.ipr
23+
*.iws
24+
test-output
25+
test-results
26+
test-tmp
27+
*.class

CopyrightWaivers.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,4 @@ viktorklang | Viktor Klang, [email protected], Typesafe Inc.
2424
smaldini | Stephane Maldini, [email protected], Pivotal Software Inc.
2525
savulchik | Stanislav Savulchik, [email protected]
2626
ktoso | Konrad Malawski, [email protected], Typesafe Inc.
27-
ouertani | Slim Ouertani, [email protected]
28-
27+
ouertani | Slim Ouertani, [email protected]

api/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
description = 'reactive-streams-api'

api/build.sbt

-11
This file was deleted.

build.gradle

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
allprojects {
2+
apply plugin: 'java'
3+
apply plugin: 'maven'
4+
apply plugin: 'eclipse'
5+
apply plugin: 'idea'
6+
apply plugin: 'ivy-publish'
7+
8+
9+
group = 'org.reactivestreams'
10+
version = '1.0.0.M1'
11+
12+
13+
gradle.projectsEvaluated {
14+
tasks.withType(JavaCompile) {
15+
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
16+
options.encoding = 'UTF-8'
17+
}
18+
19+
tasks.withType(Javadoc) {
20+
source = sourceSets.main.allJava
21+
22+
configure(options) {
23+
encoding 'UTF-8'
24+
docEncoding 'UTF-8'
25+
charSet 'UTF-8'
26+
linkSource true
27+
noTimestamp true
28+
}
29+
}
30+
}
31+
32+
uploadArchives {
33+
34+
repositories {
35+
36+
mavenDeployer {
37+
38+
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2")
39+
40+
pom.project {
41+
name 'org.reactivestreams'
42+
packaging 'jar'
43+
url 'http://www.reactive-streams.org/'
44+
inceptionYear '2014'
45+
46+
scm {
47+
url '[email protected]:reactive-streams/reactive-streams.git'
48+
connection 'scm:git:[email protected]:reactive-streams/reactive-streams.git'
49+
}
50+
51+
licenses {
52+
license {
53+
name 'CC0'
54+
url 'http://creativecommons.org/publicdomain/zero/1.0/'
55+
distribution 'repo'
56+
}
57+
}
58+
59+
developers {
60+
developer {
61+
id 'reactive-streams-sig'
62+
name 'Reactive Streams SIG'
63+
url 'http://www.reactive-streams.org/'
64+
}
65+
}
66+
}
67+
}
68+
69+
}
70+
}
71+
repositories {
72+
mavenLocal()
73+
mavenCentral()
74+
}
75+
76+
publishing {
77+
repositories {
78+
ivy {
79+
// change to point to your repo, e.g. http://my.org/repo
80+
url "${rootProject.buildDir}/repo"
81+
}
82+
}
83+
publications {
84+
ivy(IvyPublication) {
85+
from components.java
86+
descriptor.withXml {
87+
asNode().info[0].appendNode('description', description)
88+
}
89+
}
90+
}
91+
}
92+
}
93+
94+
subprojects {
95+
96+
sourceCompatibility = 1.6
97+
targetCompatibility = 1.6
98+
99+
compileJava.options.encoding = 'UTF-8'
100+
101+
javadoc {
102+
options.encoding = 'UTF-8'
103+
}
104+
}

build.sbt

-35
This file was deleted.

examples/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
description = 'reactive-streams-examples'
2+
dependencies {
3+
compile project(':reactive-streams-api')
4+
}

gradle/wrapper/gradle-wrapper.jar

49.4 KB
Binary file not shown.
+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Tue Aug 19 09:12:00 AST 2014
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-bin.zip

gradlew

+164
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
#!/usr/bin/env bash
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10+
DEFAULT_JVM_OPTS=""
11+
12+
APP_NAME="Gradle"
13+
APP_BASE_NAME=`basename "$0"`
14+
15+
# Use the maximum available, or set MAX_FD != -1 to use that value.
16+
MAX_FD="maximum"
17+
18+
warn ( ) {
19+
echo "$*"
20+
}
21+
22+
die ( ) {
23+
echo
24+
echo "$*"
25+
echo
26+
exit 1
27+
}
28+
29+
# OS specific support (must be 'true' or 'false').
30+
cygwin=false
31+
msys=false
32+
darwin=false
33+
case "`uname`" in
34+
CYGWIN* )
35+
cygwin=true
36+
;;
37+
Darwin* )
38+
darwin=true
39+
;;
40+
MINGW* )
41+
msys=true
42+
;;
43+
esac
44+
45+
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46+
if $cygwin ; then
47+
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48+
fi
49+
50+
# Attempt to set APP_HOME
51+
# Resolve links: $0 may be a link
52+
PRG="$0"
53+
# Need this for relative symlinks.
54+
while [ -h "$PRG" ] ; do
55+
ls=`ls -ld "$PRG"`
56+
link=`expr "$ls" : '.*-> \(.*\)$'`
57+
if expr "$link" : '/.*' > /dev/null; then
58+
PRG="$link"
59+
else
60+
PRG=`dirname "$PRG"`"/$link"
61+
fi
62+
done
63+
SAVED="`pwd`"
64+
cd "`dirname \"$PRG\"`/" >&-
65+
APP_HOME="`pwd -P`"
66+
cd "$SAVED" >&-
67+
68+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
69+
70+
# Determine the Java command to use to start the JVM.
71+
if [ -n "$JAVA_HOME" ] ; then
72+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
73+
# IBM's JDK on AIX uses strange locations for the executables
74+
JAVACMD="$JAVA_HOME/jre/sh/java"
75+
else
76+
JAVACMD="$JAVA_HOME/bin/java"
77+
fi
78+
if [ ! -x "$JAVACMD" ] ; then
79+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
80+
81+
Please set the JAVA_HOME variable in your environment to match the
82+
location of your Java installation."
83+
fi
84+
else
85+
JAVACMD="java"
86+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
87+
88+
Please set the JAVA_HOME variable in your environment to match the
89+
location of your Java installation."
90+
fi
91+
92+
# Increase the maximum file descriptors if we can.
93+
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
94+
MAX_FD_LIMIT=`ulimit -H -n`
95+
if [ $? -eq 0 ] ; then
96+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
97+
MAX_FD="$MAX_FD_LIMIT"
98+
fi
99+
ulimit -n $MAX_FD
100+
if [ $? -ne 0 ] ; then
101+
warn "Could not set maximum file descriptor limit: $MAX_FD"
102+
fi
103+
else
104+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
105+
fi
106+
fi
107+
108+
# For Darwin, add options to specify how the application appears in the dock
109+
if $darwin; then
110+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
111+
fi
112+
113+
# For Cygwin, switch paths to Windows format before running java
114+
if $cygwin ; then
115+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
117+
118+
# We build the pattern for arguments to be converted via cygpath
119+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120+
SEP=""
121+
for dir in $ROOTDIRSRAW ; do
122+
ROOTDIRS="$ROOTDIRS$SEP$dir"
123+
SEP="|"
124+
done
125+
OURCYGPATTERN="(^($ROOTDIRS))"
126+
# Add a user-defined pattern to the cygpath arguments
127+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129+
fi
130+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131+
i=0
132+
for arg in "$@" ; do
133+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135+
136+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138+
else
139+
eval `echo args$i`="\"$arg\""
140+
fi
141+
i=$((i+1))
142+
done
143+
case $i in
144+
(0) set -- ;;
145+
(1) set -- "$args0" ;;
146+
(2) set -- "$args0" "$args1" ;;
147+
(3) set -- "$args0" "$args1" "$args2" ;;
148+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154+
esac
155+
fi
156+
157+
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158+
function splitJvmOpts() {
159+
JVM_OPTS=("$@")
160+
}
161+
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162+
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
163+
164+
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

0 commit comments

Comments
 (0)