Updated version

LICENSE

@@ -27,12 +27,6 @@
        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
 
-     - kotlin-logging - Lightweight logging framework for Kotlin
-       [The Apache Software License, Version 2.0]
-       https://github.com/MicroUtils/kotlin-logging
-       Copyright 2021
-         Ohad Shai
-
      - SLF4J - Simple facade or abstraction for various logging frameworks
        [MIT License]
        http://www.slf4j.org
@@ -84,24 +78,6 @@
            Copyright 2021
              QOS.ch
 
-         - 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.
-
-         - kotlin-logging - Lightweight logging framework for Kotlin
-           [The Apache Software License, Version 2.0]
-           https://github.com/MicroUtils/kotlin-logging
-           Copyright 2021
-             Ohad Shai
-
-         - SLF4J - Simple facade or abstraction for various logging frameworks
-           [MIT License]
-           http://www.slf4j.org
-           Copyright 2021
-             QOS.ch
-
          - SSHJ - SSHv2 library for Java
            [The Apache Software License, Version 2.0]
            https://github.com/hierynomus/sshj
@@ -136,6 +112,18 @@
                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
@@ -151,12 +139,6 @@
                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
 
-             - PropertyLoader - Property annotation and loader for fields
-               [The Apache Software License, Version 2.0]
-               https://git.dorkbox.com/dorkbox/PropertyLoader
-               Copyright 2021
-                 Dorkbox LLC
-
      - Updates - Software Update Management
        [The Apache Software License, Version 2.0]
        https://git.dorkbox.com/dorkbox/Updates
@@ -171,9 +153,3 @@
              JetBrains s.r.o. and Kotlin Programming Language contributors
            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
-
-         - PropertyLoader - Property annotation and loader for fields
-           [The Apache Software License, Version 2.0]
-           https://git.dorkbox.com/dorkbox/PropertyLoader
-           Copyright 2021
-             Dorkbox LLC

README.md

@@ -21,7 +21,7 @@ Maven Info
     <dependency>
       <groupId>com.dorkbox</groupId>
       <artifactId>NetworkUtils</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
     </dependency>
 </dependencies>
 ```
@@ -30,7 +30,7 @@ Gradle Info
 ```
 dependencies {
     ...
-    implementation("com.dorkbox:NetworkUtils:2.4")
+    implementation("com.dorkbox:NetworkUtils:2.5")
 }
 ```
 

build.gradle.kts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import dorkbox.gradle.kotlin
 import java.time.Instant
 
 ///////////////////////////////
@@ -28,13 +27,10 @@ gradle.startParameter.warningMode = WarningMode.All
 
 
 plugins {
-    java
-
-    id("com.dorkbox.GradleUtils") version "1.17"
-    id("com.dorkbox.Licensing") version "2.5.5"
+    id("com.dorkbox.GradleUtils") version "2.6"
+    id("com.dorkbox.Licensing") version "2.6.1"
     id("com.dorkbox.VersionUpdate") version "2.3"
-    id("com.dorkbox.GradlePublish") version "1.10"
-//    id("com.dorkbox.GradleModuleInfo") version "1.1"
+    id("com.dorkbox.GradlePublish") version "1.11"
 
     kotlin("jvm") version "1.4.32"
 }
@@ -43,7 +39,7 @@ 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.4"
+    const val version = "2.5"
 
     // set as project.ext
     const val name = "NetworkUtils"
@@ -59,10 +55,9 @@ object Extras {
 /////  assign 'Extras'
 ///////////////////////////////
 GradleUtils.load("$projectDir/../../gradle.properties", Extras)
-GradleUtils.fixIntellijPaths()
-GradleUtils.defaultResolutionStrategy()
+GradleUtils.defaults()
 GradleUtils.compileConfiguration(JavaVersion.VERSION_1_8)
-
+GradleUtils.jpms(JavaVersion.VERSION_1_9)
 
 licensing {
     license(License.APACHE_2) {
@@ -86,47 +81,6 @@ licensing {
     }
 }
 
-
-sourceSets {
-    main {
-        java {
-            setSrcDirs(listOf("src"))
-
-            // want to include java files for the source. 'setSrcDirs' resets includes...
-            include("**/*.java")
-        }
-
-        kotlin {
-            setSrcDirs(listOf("src"))
-
-            // want to include java files for the source. 'setSrcDirs' resets includes...
-            include("**/*.java", "**/*.kt")
-        }
-    }
-
-    test {
-        java {
-            setSrcDirs(listOf("test"))
-
-            // want to include java files for the source. 'setSrcDirs' resets includes...
-            include("**/*.java")
-        }
-
-        kotlin {
-            setSrcDirs(listOf("test"))
-
-            // want to include java files for the source. 'setSrcDirs' resets includes...
-            include("**/*.java", "**/*.kt")
-        }
-    }
-}
-
-repositories {
-    mavenLocal() // this must be first!
-    jcenter()
-}
-
-
 tasks.jar.get().apply {
     manifest {
         // https://docs.oracle.com/javase/tutorial/deployment/jar/packageman.html
@@ -139,26 +93,22 @@ tasks.jar.get().apply {
         attributes["Implementation-Title"] = "${Extras.group}.${Extras.id}"
         attributes["Implementation-Version"] = Extras.buildDate
         attributes["Implementation-Vendor"] = Extras.vendor
-
-        attributes["Automatic-Module-Name"] = Extras.id
     }
 }
 
 dependencies {
-    // https://github.com/MicroUtils/kotlin-logging
-    implementation("io.github.microutils:kotlin-logging:2.0.6")  // slick kotlin wrapper for slf4j
-    implementation("org.slf4j:slf4j-api:1.7.30")
+    implementation("org.slf4j:slf4j-api:1.8.0-beta4")
 
-    implementation("com.dorkbox:Executor:3.1")
-    implementation("com.dorkbox:Updates:1.0")
+    implementation("com.dorkbox:Executor:3.2")
+    implementation("com.dorkbox:Updates:1.1")
 
     val jnaVersion = "5.8.0"
-    implementation("net.java.dev.jna:jna:$jnaVersion")
-    implementation("net.java.dev.jna:jna-platform:$jnaVersion")
+    implementation("net.java.dev.jna:jna-jpms:$jnaVersion")
+    implementation("net.java.dev.jna:jna-platform-jpms:$jnaVersion")
 
     testImplementation("junit:junit:4.13.2")
-    testImplementation("ch.qos.logback:logback-classic:1.2.3")
-    testImplementation("com.dorkbox:Utilities:1.9")
+    testImplementation("ch.qos.logback:logback-classic:1.3.0-alpha4")
+    testImplementation("com.dorkbox:Utilities:1.10")
 }
 
 publishToSonatype {

src/dorkbox/netUtil/Arp.kt

@@ -7,7 +7,7 @@ object Arp {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     // Now setup ARP Proxy for this interface (so ARP requests are answered correctly)
     fun proxyAdd(interfaceName: String) {

src/dorkbox/netUtil/Common.kt

@@ -15,7 +15,7 @@ internal object Common {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     val OS_LINUX: Boolean
     val OS_WINDOWS: Boolean

src/dorkbox/netUtil/Dhcp.kt

@@ -10,7 +10,7 @@ object Dhcp {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     fun start(id: String, interfaceName: String) {
         if (Common.OS_LINUX) {

src/dorkbox/netUtil/Dns.kt

@@ -18,7 +18,7 @@ object Dns {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     const val DEFAULT_SEARCH_DOMAIN = ""
 

src/dorkbox/netUtil/IP.kt

@@ -20,7 +20,7 @@ object IP {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     /**
      * The [InetAddress] that represents the loopback address. If IPv6 stack is available, it will refer to

src/dorkbox/netUtil/IPRoute.kt

@@ -10,7 +10,7 @@ object IPRoute {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     private val reservedTable = StringBuilder(2048)
     private val tableNames: MutableMap<Int, String?> = HashMap(256)

src/dorkbox/netUtil/IPv4.kt

@@ -38,7 +38,7 @@ object IPv4 {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     /**
      * Returns `true` if IPv4 should be used even if the system supports both IPv4 and IPv6. Setting this

src/dorkbox/netUtil/IPv6.kt

@@ -32,7 +32,7 @@ object IPv6 {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     /**
      * Maximum amount of value adding characters in between IPV6 separators

src/dorkbox/netUtil/IfConfig.kt

@@ -9,7 +9,7 @@ object IfConfig {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     fun assignMac(interfaceName: String, interfaceMac: String) {
         if (Common.OS_LINUX) {

src/dorkbox/netUtil/Iface.kt

@@ -10,7 +10,7 @@ object Iface {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     private val ifToIp: MutableMap<String, String> = HashMap()
 

src/dorkbox/netUtil/Mac.kt

@@ -19,7 +19,7 @@ object Mac {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     enum class MacDelimiter(val delimiter: String) {
         COLON(":"),

src/dorkbox/netUtil/NameSpace.kt

@@ -10,7 +10,7 @@ object NameSpace {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     object Route {
         fun flush(nameSpace: String) {

src/dorkbox/netUtil/Route.kt

@@ -9,7 +9,7 @@ object Route {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     fun flush() {
         Executor.run("/sbin/ip", "route", "flush", "cache")

src/dorkbox/netUtil/Sntp.kt

@@ -20,7 +20,7 @@ object Sntp {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     /**
      * SNTP client for retrieving time.

src/dorkbox/netUtil/SocketUtils.kt

@@ -37,7 +37,7 @@ object SocketUtils {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     private val EMPTY = Collections.enumeration(emptyList<Any>())
 

src/dorkbox/netUtil/VirtualEth.kt

@@ -9,7 +9,7 @@ object VirtualEth {
     /**
      * Gets the version number.
      */
-    const val version = "2.4"
+    const val version = "2.5"
 
     fun add(host: String, guest: String) {
         if (Common.OS_LINUX) {

src/dorkbox/netUtil/ping/Ping.kt

@@ -16,7 +16,7 @@ class Ping {
         /**
          * Gets the version number.
          */
-        const val version = "2.4"
+        const val version = "2.5"
     }
 
     private val count = 4