diff --git a/.gitignore b/.gitignore index f161bbcf..7211c68f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,15 @@ target/ .history .idea .idea_modules +.gradle +.settings +bin +build +out +*.iml +*.ipr +*.iws +test-output +test-results +test-tmp +*.class diff --git a/CopyrightWaivers.txt b/CopyrightWaivers.txt index b48a9b75..0e9bbe6b 100644 --- a/CopyrightWaivers.txt +++ b/CopyrightWaivers.txt @@ -24,5 +24,4 @@ viktorklang | Viktor Klang, viktor.klang@gmail.com, Typesafe Inc. smaldini | Stephane Maldini, stephane.maldini@gmail.com, Pivotal Software Inc. savulchik | Stanislav Savulchik, s.savulchik@gmail.com ktoso | Konrad Malawski, konrad.malawski@project13.pl, Typesafe Inc. -ouertani | Slim Ouertani, ouertani@gmail.com - +ouertani | Slim Ouertani, ouertani@gmail.com \ No newline at end of file diff --git a/api/build.gradle b/api/build.gradle new file mode 100644 index 00000000..65c0f4ee --- /dev/null +++ b/api/build.gradle @@ -0,0 +1 @@ +description = 'reactive-streams-api' diff --git a/api/build.sbt b/api/build.sbt deleted file mode 100644 index c305aa53..00000000 --- a/api/build.sbt +++ /dev/null @@ -1,11 +0,0 @@ -name := "reactive-streams" - -javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation") - -javacOptions in (Compile,doc) ++= Seq("-encoding","UTF-8","-docencoding", "UTF-8", "-charset", "UTF-8", "-notimestamp", "-linksource") - -autoScalaLibrary := false - -crossPaths := false - -publishMavenStyle := true diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..82cfa6b9 --- /dev/null +++ b/build.gradle @@ -0,0 +1,104 @@ +allprojects { + apply plugin: 'java' + apply plugin: 'maven' + apply plugin: 'eclipse' + apply plugin: 'idea' + apply plugin: 'ivy-publish' + + + group = 'org.reactivestreams' + version = '1.0.0.M1' + + + gradle.projectsEvaluated { + tasks.withType(JavaCompile) { + options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" + options.encoding = 'UTF-8' + } + + tasks.withType(Javadoc) { + source = sourceSets.main.allJava + + configure(options) { + encoding 'UTF-8' + docEncoding 'UTF-8' + charSet 'UTF-8' + linkSource true + noTimestamp true + } + } + } + + uploadArchives { + + repositories { + + mavenDeployer { + + repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") + + pom.project { + name 'org.reactivestreams' + packaging 'jar' + url 'http://www.reactive-streams.org/' + inceptionYear '2014' + + scm { + url 'git@github.com:reactive-streams/reactive-streams.git' + connection 'scm:git:git@github.com:reactive-streams/reactive-streams.git' + } + + licenses { + license { + name 'CC0' + url 'http://creativecommons.org/publicdomain/zero/1.0/' + distribution 'repo' + } + } + + developers { + developer { + id 'reactive-streams-sig' + name 'Reactive Streams SIG' + url 'http://www.reactive-streams.org/' + } + } + } + } + + } + } + repositories { + mavenLocal() + mavenCentral() + } + + publishing { + repositories { + ivy { + // change to point to your repo, e.g. http://my.org/repo + url "${rootProject.buildDir}/repo" + } + } + publications { + ivy(IvyPublication) { + from components.java + descriptor.withXml { + asNode().info[0].appendNode('description', description) + } + } + } + } +} + +subprojects { + + sourceCompatibility = 1.6 + targetCompatibility = 1.6 + + compileJava.options.encoding = 'UTF-8' + + javadoc { + options.encoding = 'UTF-8' + } +} \ No newline at end of file diff --git a/build.sbt b/build.sbt deleted file mode 100644 index dde2bc65..00000000 --- a/build.sbt +++ /dev/null @@ -1,35 +0,0 @@ -organization in ThisBuild := "org.reactivestreams" - -version in ThisBuild := "1.0.0.M1" - -scalaVersion in ThisBuild := "2.10.3" - -licenses in ThisBuild := Seq("CC0" -> url("http://creativecommons.org/publicdomain/zero/1.0/")) - -homepage in ThisBuild := Some(url("http://www.reactive-streams.org/")) - -publishTo in ThisBuild := Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2") - -lazy val api = project - -lazy val tck = project.dependsOn(api) - -lazy val examples = project.dependsOn(api) - -publishArtifact := false // for this aggregate project - -EclipseKeys.projectFlavor in ThisBuild := EclipseProjectFlavor.Java - -pomExtra in ThisBuild := ( - - git@github.com:reactive-streams/reactive-streams.git - scm:git:git@github.com:reactive-streams/reactive-streams.git - - - - reactive-streams-sig - Reactive Streams SIG - http://www.reactive-streams.org/ - - - ) diff --git a/examples/build.gradle b/examples/build.gradle new file mode 100644 index 00000000..1e6638de --- /dev/null +++ b/examples/build.gradle @@ -0,0 +1,4 @@ +description = 'reactive-streams-examples' +dependencies { + compile project(':reactive-streams-api') +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..58385981 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..b4be6247 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Aug 19 09:12:00 AST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..91a7e269 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100755 index 00000000..8a0b282a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/project/build.properties b/project/build.properties deleted file mode 100644 index 37b489cb..00000000 --- a/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=0.13.1 diff --git a/project/plugins.sbt b/project/plugins.sbt deleted file mode 100644 index a5ddf282..00000000 --- a/project/plugins.sbt +++ /dev/null @@ -1,3 +0,0 @@ -addSbtPlugin("de.johoop" % "sbt-testng-plugin" % "3.0.0") - -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0") diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..09cfeee3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +rootProject.name = 'reactive-streams' +include ':reactive-streams-api' +include ':reactive-streams-tck' +include ':reactive-streams-examples' + +project(':reactive-streams-api').projectDir = "$rootDir/api" as File +project(':reactive-streams-tck').projectDir = "$rootDir/tck" as File +project(':reactive-streams-examples').projectDir = "$rootDir/examples" as File + diff --git a/tck/build.gradle b/tck/build.gradle new file mode 100644 index 00000000..0ceab9a7 --- /dev/null +++ b/tck/build.gradle @@ -0,0 +1,6 @@ +description = 'reactive-streams-tck' +dependencies { + compile group: 'org.testng', name: 'testng', version:'5.14.10' + compile project(':reactive-streams-api') +} +test.useTestNG() diff --git a/tck/build.sbt b/tck/build.sbt deleted file mode 100644 index 7bf2a88f..00000000 --- a/tck/build.sbt +++ /dev/null @@ -1,17 +0,0 @@ -import de.johoop.testngplugin.TestNGPlugin._ - -name := "reactive-streams-tck" - -javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation") - -javacOptions in (Compile,doc) ++= Seq("-encoding","UTF-8","-docencoding", "UTF-8", "-charset", "UTF-8", "-notimestamp", "-linksource") - -autoScalaLibrary := false - -crossPaths := false - -publishMavenStyle := true - -libraryDependencies += "org.testng" % "testng" % "6.8.5" - -testNGSettings