From 8513d90c99387cf3cb70408020da6f0f139f05ed Mon Sep 17 00:00:00 2001 From: Robinson Date: Thu, 3 Mar 2022 00:39:25 +0100 Subject: [PATCH] Updated dependencies. --- LICENSE | 38 ++-- README.md | 4 +- build.gradle.kts | 24 +-- gradlew | 269 +++++++++++++++++------------ gradlew.bat | 178 +++++++++---------- src/dorkbox/netUtil/Arp.kt | 2 +- src/dorkbox/netUtil/Common.kt | 2 +- src/dorkbox/netUtil/Dhcp.kt | 2 +- src/dorkbox/netUtil/Dns.kt | 2 +- src/dorkbox/netUtil/IP.kt | 2 +- src/dorkbox/netUtil/IPRoute.kt | 2 +- src/dorkbox/netUtil/IPv4.kt | 2 +- src/dorkbox/netUtil/IPv6.kt | 2 +- src/dorkbox/netUtil/IfConfig.kt | 2 +- src/dorkbox/netUtil/Iface.kt | 2 +- src/dorkbox/netUtil/Inet4.kt | 2 +- src/dorkbox/netUtil/Inet6.kt | 2 +- src/dorkbox/netUtil/Mac.kt | 2 +- src/dorkbox/netUtil/NameSpace.kt | 2 +- src/dorkbox/netUtil/Route.kt | 2 +- src/dorkbox/netUtil/Sntp.kt | 2 +- src/dorkbox/netUtil/SocketUtils.kt | 2 +- src/dorkbox/netUtil/VirtualEth.kt | 2 +- src/dorkbox/netUtil/ping/Ping.kt | 2 +- 24 files changed, 300 insertions(+), 251 deletions(-) mode change 100644 => 100755 gradlew diff --git a/LICENSE b/LICENSE index f3082c1..9c37ae6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ - NetworkUtils - Utilities for managing network configurations, IP/MAC address conversion, and ping (via OS native commands) [The Apache Software License, Version 2.0] https://git.dorkbox.com/dorkbox/NetworkUtils - Copyright 2021 + Copyright 2022 Dorkbox LLC Extra license information @@ -30,25 +30,25 @@ - SLF4J - Simple facade or abstraction for various logging frameworks [MIT License] http://www.slf4j.org - Copyright 2021 + Copyright 2022 QOS.ch - JNA - Simplified native library access for Java. [The Apache Software License, Version 2.0] https://github.com/twall/jna - Copyright 2021 + Copyright 2022 Timothy Wall - JNA-Platform - Mappings for a number of commonly used platform functions [The Apache Software License, Version 2.0] https://github.com/twall/jna - Copyright 2021 + Copyright 2022 Timothy Wall - Executor - Shell, JVM, and SSH command execution on Linux, MacOS, or Windows for Java 8+ [The Apache Software License, Version 2.0] https://git.dorkbox.com/dorkbox/Executor - Copyright 2021 + Copyright 2022 Dorkbox LLC Extra license information @@ -72,16 +72,28 @@ Kotlin Compiler, Test Data+Libraries, and Tools repository contain third-party code, to which different licenses may apply See: https://github.com/JetBrains/kotlin/blob/master/license/README.md + - kotlinx.coroutines - Library support for Kotlin coroutines with multiplatform support + [The Apache Software License, Version 2.0] + https://github.com/Kotlin/kotlinx.coroutines + Copyright 2022 + JetBrains s.r.o. + + - SLF4J - Simple facade or abstraction for various logging frameworks + [MIT License] + http://www.slf4j.org + Copyright 2022 + QOS.ch + - Logback - Logback is a logging framework for Java applications [The Apache Software License, Version 2.0] http://logback.qos.ch - Copyright 2021 + Copyright 2022 QOS.ch - SSHJ - SSHv2 library for Java [The Apache Software License, Version 2.0] https://github.com/hierynomus/sshj - Copyright 2021 + Copyright 2022 Jeroen van Erp SSHJ Contributors @@ -112,18 +124,6 @@ https://github.com/str4d/ed25519-java https://github.com/str4d - - kotlinx.coroutines - Library support for Kotlin coroutines with multiplatform support - [The Apache Software License, Version 2.0] - https://github.com/Kotlin/kotlinx.coroutines - Copyright 2021 - JetBrains s.r.o. - - - SLF4J - Simple facade or abstraction for various logging frameworks - [MIT License] - http://www.slf4j.org - Copyright 2021 - QOS.ch - - Updates - Software Update Management [The Apache Software License, Version 2.0] https://git.dorkbox.com/dorkbox/Updates diff --git a/README.md b/README.md index ad598df..ef34303 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Maven Info com.dorkbox NetworkUtils - 2.8 + 2.9.1 ``` @@ -30,7 +30,7 @@ Gradle Info ``` dependencies { ... - implementation("com.dorkbox:NetworkUtils:2.8") + implementation("com.dorkbox:NetworkUtils:2.9.1") } ``` diff --git a/build.gradle.kts b/build.gradle.kts index ffcc8c8..6df6549 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,19 +27,19 @@ gradle.startParameter.warningMode = WarningMode.All plugins { - id("com.dorkbox.GradleUtils") version "2.9" - id("com.dorkbox.Licensing") version "2.9.2" + id("com.dorkbox.GradleUtils") version "2.16" + id("com.dorkbox.Licensing") version "2.12" id("com.dorkbox.VersionUpdate") version "2.4" - id("com.dorkbox.GradlePublish") version "1.11" + id("com.dorkbox.GradlePublish") version "1.12" - kotlin("jvm") version "1.5.0" + kotlin("jvm") version "1.6.10" } object Extras { // set for the project const val description = "Utilities for managing network configurations, IP/MAC address conversion, and ping (via OS native commands)" const val group = "com.dorkbox" - const val version = "2.8" + const val version = "2.9.1" // set as project.ext const val name = "NetworkUtils" @@ -99,18 +99,18 @@ tasks.jar.get().apply { } dependencies { - implementation("org.slf4j:slf4j-api:1.8.0-beta4") + api("org.slf4j:slf4j-api:1.8.0-beta4") - implementation("com.dorkbox:Executor:3.2") - implementation("com.dorkbox:Updates:1.1") + api("com.dorkbox:Executor:3.9") + api("com.dorkbox:Updates:1.1") - val jnaVersion = "5.8.0" - implementation("net.java.dev.jna:jna-jpms:$jnaVersion") - implementation("net.java.dev.jna:jna-platform-jpms:$jnaVersion") + val jnaVersion = "5.10.0" + api("net.java.dev.jna:jna-jpms:$jnaVersion") + api("net.java.dev.jna:jna-platform-jpms:$jnaVersion") testImplementation("junit:junit:4.13.2") testImplementation("ch.qos.logback:logback-classic:1.3.0-alpha4") - testImplementation("com.dorkbox:Utilities:1.10") + testImplementation("com.dorkbox:Utilities:1.13") } publishToSonatype { diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 4f906e0..1b6c787 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "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 or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # 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=`expr $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" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@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 - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@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="-Xmx64m" "-Xms64m" - -@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 execute - -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 execute - -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 - -: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 %* - -: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 +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@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 + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + +@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 execute + +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 execute + +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 + +: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 %* + +: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/src/dorkbox/netUtil/Arp.kt b/src/dorkbox/netUtil/Arp.kt index 8f6a9ae..b0a2341 100644 --- a/src/dorkbox/netUtil/Arp.kt +++ b/src/dorkbox/netUtil/Arp.kt @@ -7,7 +7,7 @@ object Arp { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" // Now setup ARP Proxy for this interface (so ARP requests are answered correctly) fun proxyAdd(interfaceName: String) { diff --git a/src/dorkbox/netUtil/Common.kt b/src/dorkbox/netUtil/Common.kt index bf6fc0b..4e10913 100644 --- a/src/dorkbox/netUtil/Common.kt +++ b/src/dorkbox/netUtil/Common.kt @@ -15,7 +15,7 @@ internal object Common { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" val OS_LINUX: Boolean val OS_WINDOWS: Boolean diff --git a/src/dorkbox/netUtil/Dhcp.kt b/src/dorkbox/netUtil/Dhcp.kt index d77ccef..cd2f282 100644 --- a/src/dorkbox/netUtil/Dhcp.kt +++ b/src/dorkbox/netUtil/Dhcp.kt @@ -10,7 +10,7 @@ object Dhcp { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" fun start(id: String, interfaceName: String) { if (Common.OS_LINUX) { diff --git a/src/dorkbox/netUtil/Dns.kt b/src/dorkbox/netUtil/Dns.kt index d068cf9..c93c76f 100644 --- a/src/dorkbox/netUtil/Dns.kt +++ b/src/dorkbox/netUtil/Dns.kt @@ -18,7 +18,7 @@ object Dns { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" const val DEFAULT_SEARCH_DOMAIN = "" diff --git a/src/dorkbox/netUtil/IP.kt b/src/dorkbox/netUtil/IP.kt index 1a0d081..3c777f0 100644 --- a/src/dorkbox/netUtil/IP.kt +++ b/src/dorkbox/netUtil/IP.kt @@ -20,7 +20,7 @@ object IP { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" /** * The [InetAddress] that represents the loopback address. If IPv6 stack is available, it will refer to diff --git a/src/dorkbox/netUtil/IPRoute.kt b/src/dorkbox/netUtil/IPRoute.kt index 865a804..8b0662b 100644 --- a/src/dorkbox/netUtil/IPRoute.kt +++ b/src/dorkbox/netUtil/IPRoute.kt @@ -10,7 +10,7 @@ object IPRoute { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" private val reservedTable = StringBuilder(2048) private val tableNames: MutableMap = HashMap(256) diff --git a/src/dorkbox/netUtil/IPv4.kt b/src/dorkbox/netUtil/IPv4.kt index d383d1c..e6827da 100644 --- a/src/dorkbox/netUtil/IPv4.kt +++ b/src/dorkbox/netUtil/IPv4.kt @@ -38,7 +38,7 @@ object IPv4 { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" /** * Returns `true` if IPv4 should be used even if the system supports both IPv4 and IPv6. Setting this diff --git a/src/dorkbox/netUtil/IPv6.kt b/src/dorkbox/netUtil/IPv6.kt index 644312e..8539181 100644 --- a/src/dorkbox/netUtil/IPv6.kt +++ b/src/dorkbox/netUtil/IPv6.kt @@ -33,7 +33,7 @@ object IPv6 { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" // used for subnet mask info private val MINUS_ONE = BigInteger.valueOf(-1) diff --git a/src/dorkbox/netUtil/IfConfig.kt b/src/dorkbox/netUtil/IfConfig.kt index 303a595..d9af9e3 100644 --- a/src/dorkbox/netUtil/IfConfig.kt +++ b/src/dorkbox/netUtil/IfConfig.kt @@ -9,7 +9,7 @@ object IfConfig { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" fun assignMac(interfaceName: String, interfaceMac: String) { if (Common.OS_LINUX) { diff --git a/src/dorkbox/netUtil/Iface.kt b/src/dorkbox/netUtil/Iface.kt index 8a154dd..967822a 100644 --- a/src/dorkbox/netUtil/Iface.kt +++ b/src/dorkbox/netUtil/Iface.kt @@ -9,7 +9,7 @@ object Iface { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" private val ifToIp: MutableMap = HashMap() diff --git a/src/dorkbox/netUtil/Inet4.kt b/src/dorkbox/netUtil/Inet4.kt index 6ee1a4c..50ed4d3 100644 --- a/src/dorkbox/netUtil/Inet4.kt +++ b/src/dorkbox/netUtil/Inet4.kt @@ -24,7 +24,7 @@ object Inet4 { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" /** * Returns the [Inet4Address] representation of a [String] IP or host address. diff --git a/src/dorkbox/netUtil/Inet6.kt b/src/dorkbox/netUtil/Inet6.kt index 2658836..e6a7414 100644 --- a/src/dorkbox/netUtil/Inet6.kt +++ b/src/dorkbox/netUtil/Inet6.kt @@ -24,7 +24,7 @@ object Inet6 { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" /** * Returns the [Inet6Address] representation of a [String] IP or host address. diff --git a/src/dorkbox/netUtil/Mac.kt b/src/dorkbox/netUtil/Mac.kt index fe9c5bb..7bc3017 100644 --- a/src/dorkbox/netUtil/Mac.kt +++ b/src/dorkbox/netUtil/Mac.kt @@ -19,7 +19,7 @@ object Mac { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" enum class MacDelimiter(val delimiter: String) { COLON(":"), diff --git a/src/dorkbox/netUtil/NameSpace.kt b/src/dorkbox/netUtil/NameSpace.kt index d6f9651..c7b38f2 100644 --- a/src/dorkbox/netUtil/NameSpace.kt +++ b/src/dorkbox/netUtil/NameSpace.kt @@ -10,7 +10,7 @@ object NameSpace { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" object Route { fun flush(nameSpace: String) { diff --git a/src/dorkbox/netUtil/Route.kt b/src/dorkbox/netUtil/Route.kt index 5f5ccfe..83db424 100644 --- a/src/dorkbox/netUtil/Route.kt +++ b/src/dorkbox/netUtil/Route.kt @@ -9,7 +9,7 @@ object Route { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" fun flush() { Executor.run("/sbin/ip", "route", "flush", "cache") diff --git a/src/dorkbox/netUtil/Sntp.kt b/src/dorkbox/netUtil/Sntp.kt index 0752730..52019c1 100644 --- a/src/dorkbox/netUtil/Sntp.kt +++ b/src/dorkbox/netUtil/Sntp.kt @@ -20,7 +20,7 @@ object Sntp { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" /** * SNTP client for retrieving time. diff --git a/src/dorkbox/netUtil/SocketUtils.kt b/src/dorkbox/netUtil/SocketUtils.kt index 463bf88..7f04d0a 100644 --- a/src/dorkbox/netUtil/SocketUtils.kt +++ b/src/dorkbox/netUtil/SocketUtils.kt @@ -37,7 +37,7 @@ object SocketUtils { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" private val EMPTY = Collections.enumeration(emptyList()) diff --git a/src/dorkbox/netUtil/VirtualEth.kt b/src/dorkbox/netUtil/VirtualEth.kt index e7afdf0..347e17c 100644 --- a/src/dorkbox/netUtil/VirtualEth.kt +++ b/src/dorkbox/netUtil/VirtualEth.kt @@ -6,7 +6,7 @@ object VirtualEth { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" fun add(host: String, guest: String) { if (Common.OS_LINUX) { diff --git a/src/dorkbox/netUtil/ping/Ping.kt b/src/dorkbox/netUtil/ping/Ping.kt index e3a92ee..500c931 100644 --- a/src/dorkbox/netUtil/ping/Ping.kt +++ b/src/dorkbox/netUtil/ping/Ping.kt @@ -16,7 +16,7 @@ class Ping { /** * Gets the version number. */ - const val version = "2.8" + const val version = "2.9.1" } private val count = 4