diff --git a/.gitignore b/.gitignore index 2740337..8747b69 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ target *.gz *.iso *.jar +!/gradle/wrapper/gradle-wrapper.jar *.rar *.tar *.war diff --git a/.travis.yml b/.travis.yml index 69cd4e4..af49ebc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,8 @@ language: java jdk: oraclejdk7 # Compile and package JAR and set build properties -install: mvn package -DbuildNumber=$TRAVIS_BUILD_NUMBER -DciSystem=travis -Dcommit=${TRAVIS_COMMIT:0:7} +install: mvn dependency:go-offline +script: mvn package -DbuildNumber=$TRAVIS_BUILD_NUMBER -DciSystem=travis -Dcommit=${TRAVIS_COMMIT:0:7} # Perform steps after compilation/test success after_success: diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..ed7f335 --- /dev/null +++ b/build.gradle @@ -0,0 +1,201 @@ +// Default tasks +defaultTasks 'clean', 'licenseFormat', 'build', 'install' + +// Apply plugins +apply plugin: 'cobertura' +apply plugin: 'coveralls' +apply plugin: 'license' +apply plugin: 'maven' +apply plugin: 'signing' + +// Project information +ext.projectName = 'Flow Networking' +group = 'com.flowpowered' +archivesBaseName = 'flow-networking' +version = '1.0.0-SNAPSHOT' +ext.packaging = 'jar' +ext.inceptionYear = '2013' +ext.url = 'http://flowpowered.com' +ext.description = 'Flexible serialization and configuration library for the Flow collection.' + +// Organization information +ext.organization = 'Spout LLC' +ext.organizationUrl = 'https://spout.org' + +// Build properties +ext.buildNumber = project.hasProperty('buildNumber') ? buildNumber : '0' +ext.ciSystem = project.hasProperty('ciSystem') ? ciSystem : 'unknown' +ext.commit = project.hasProperty('commit') ? commit : 'unknown' + +// Build plugin repositories and dependencies +buildscript { + repositories { + mavenLocal() + mavenCentral() + maven { + name = 'sonatype-nexus' + url = 'https://oss.sonatype.org/content/groups/public/' + } + } + dependencies { + classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.9.0' + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:0.5.0' + classpath 'net.saliman:gradle-cobertura-plugin:2.2.4' // Coveralls plugin dependency + } +} + +// Project repositories +repositories { + mavenLocal() + mavenCentral() + maven { + name = 'sonatype-nexus' + url = 'https://oss.sonatype.org/content/groups/public/' + } +} + +// Project dependencies +dependencies { + compile 'io.netty:netty-all:4.0.21.Final' + compile 'org.slf4j:slf4j-api:1.7.7' + testCompile 'junit:junit:4.11' + testCompile 'org.hamcrest:hamcrest-library:1.3' + testCompile 'org.powermock:powermock-api-mockito:1.5.5' + testCompile 'org.powermock:powermock-module-junit4:1.5.5' +} + +// Filter, process, and include resources +processResources { + // Include in final JAR + from(rootProject.rootDir) { + include 'LICENSE.txt' + } +} + +// License header formatting +license { + ext.project = projectName + ext.year = inceptionYear + ext.name = organization + ext.url = organizationUrl + header rootProject.file('HEADER.txt') + ignoreFailures true + strictCheck true + useDefaultMappings false + mapping { java = 'SLASHSTAR_STYLE' } +} + +// Source compiler configuration +configure([compileJava, compileTestJava]) { + sourceCompatibility = '1.7' + targetCompatibility = '1.7' + options.encoding = 'UTF-8' + options.compilerArgs << '-Xlint:all' + options.compilerArgs << '-Xlint:-path' + options.deprecation = true +} + +// JAR manifest configuration +jar.manifest.mainAttributes( + 'Built-By': System.properties['user.name'], + 'Created-By': System.properties['java.vm.version'] + ' (' + System.properties['java.vm.vendor'] + ')', + 'Specification-Title': projectName, + 'Specification-Version': version + '+' + ciSystem + '-b' + buildNumber + '.git-' + commit, + 'Specification-Vendor': organization + ' - ' + organizationUrl) + +// Coveralls report configuration +cobertura.coverageFormats = ['html', 'xml'] // Coveralls requires xml format + +// Artifact deployment +uploadArchives { + repositories.mavenDeployer { + // Javadoc JAR generation + task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from 'build/docs/javadoc' + } + + // Source JAR generation + task sourcesJar(type: Jar) { + classifier = 'sources' + from sourceSets.main.java.srcDirs + } + + // Set all artifacts + artifacts { + archives jar, javadocJar, sourcesJar + } + + // Tasks and variables based on if release or snapshot + if (version.endsWith('-SNAPSHOT')) { + // Set variable to snapshots repository URL + ext.sonatypeUrl = 'https://oss.sonatype.org/content/repositories/snapshots/' + } else { + // Set variable to releases repository URL + ext.sonatypeUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' + + // Artifact signing + signing { + // Sign JAR artifacts + sign configurations.archives + + // Sign Maven POM + beforeDeployment { + org.gradle.api.artifacts.maven.MavenDeployment deployment -> signing.signPom(deployment) + } + } + } + + // Set login credentials for repository + repository(url: sonatypeUrl) { + authentication(userName: System.getenv("sonatypeUsername"), password: System.getenv("sonatypePassword")) + } + + // Maven POM generation + pom.project { + name projectName + artifactId archivesBaseName + packaging packaging + inceptionYear inceptionYear + url url + description project.ext.description + + scm { + connection 'scm:git:git://github.com/flow/flow-networking.git' + developerConnection 'scm:git:ssh://git@github.com:flow/flow-networking.git' + url 'https://github.com/flow/flow-networking' + } + + licenses { + license { + name 'MIT License' + url 'https://tldrlegal.com/license/mit-license' + distribution 'repo' + } + } + + organization { + name organization + url organizationUrl + } + + developers { + developer { + id 'kitskub' + name 'Jack Huey' + email 'kitskub@gmail.com' + } + developer { + id 'Wolf480pl' + name 'Wolf480pl' + email 'wolf480@interia.pl' + } + developer { + id 'Wulfspider' + name 'Luke Spragg' + email 'the@wulf.im' + } + } + } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..0a836bd --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +signing.keyId= +signing.password= +signing.secretKeyRingFile= +sonatypeUsername= +sonatypePassword= diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..667288a 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 0000000..83d0a56 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-2.0-bin.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..91a7e26 --- /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 100644 index 0000000..8a0b282 --- /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