updated deps. Updated version

2023-02-03 15:45:14 +01:00 · 2023-02-03 15:45:14 +01:00 · e51be850a1
parent e07171b631
commit e51be850a1
4 changed files with 44 additions and 20 deletions
--- a/38
+++ b/38
@ -130,7 +130,7 @@
     - 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 2022
+       Copyright 2023
         Dorkbox LLC

       Extra license information
@ -157,25 +157,25 @@
         - 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
+           Copyright 2023
             JetBrains s.r.o.

         - SLF4J - Simple facade or abstraction for various logging frameworks
           [MIT License]
           http://www.slf4j.org
-           Copyright 2022
+           Copyright 2023
             QOS.ch

         - Logback - Logback is a logging framework for Java applications
           [The Apache Software License, Version 2.0]
           http://logback.qos.ch
-           Copyright 2022
+           Copyright 2023
             QOS.ch

         - SSHJ - SSHv2 library for Java
           [The Apache Software License, Version 2.0]
           https://github.com/hierynomus/sshj
-           Copyright 2022
+           Copyright 2023
             Jeroen van Erp
             SSHJ Contributors

@ -221,13 +221,37 @@
               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

-     - Version - Java Semantic Versioning with exceptions. Minor/Patch number optional and build-after-final-dot (minor/patch) permitted.
+     - Version - Java Semantic Versioning with exceptions.
       [MIT License]
       https://git.dorkbox.com/dorkbox/Version
-       Copyright 2020
+       Copyright 2023
         Dorkbox LLC
         G. Richard Bellamy
         Kenduck
         Larry Bordowitz <lbordowitz@yahoo-inc.com>
         Martin Rüegg <martin.rueegg@bristolpound.org> <martin.rueegg@metaworx.ch>
         Zafar Khaja <zafarkhaja@gmail.com>
+
+       Extra license information
+         - Kotlin - 
+           [The Apache Software License, Version 2.0]
+           https://github.com/JetBrains/kotlin
+           Copyright 2020
+             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
+
+         - Updates - Software Update Management
+           [The Apache Software License, Version 2.0]
+           https://git.dorkbox.com/dorkbox/Updates
+           Copyright 2021
+             Dorkbox LLC
+
+           Extra license information
+             - Kotlin - 
+               [The Apache Software License, Version 2.0]
+               https://github.com/JetBrains/kotlin
+               Copyright 2020
+                 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
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -22,9 +22,9 @@ plugins {

    id("com.gradle.plugin-publish") version "1.1.0"

-    id("com.dorkbox.GradleUtils") version "3.8"
-    id("com.dorkbox.Licensing") version "2.19.1"
-    id("com.dorkbox.VersionUpdate") version "2.5"
+    id("com.dorkbox.GradleUtils") version "3.11"
+    id("com.dorkbox.Licensing") version "2.21"
+    id("com.dorkbox.VersionUpdate") version "2.6"

    kotlin("jvm") version "1.7.20"
 }
@ -84,8 +84,8 @@ dependencies {

    // this is used to announce the version of vaadin to use with the plugin
    implementation("com.dorkbox:VaadinUndertow:${Extras.vaadinUndertowVer}")
-    implementation("com.dorkbox:Executor:3.11")
-    implementation("com.dorkbox:Version:2.4")
+    implementation("com.dorkbox:Executor:3.12")
+    implementation("com.dorkbox:Version:3.1")
 }

 tasks.jar.get().apply {
--- a/src/dorkbox/gradleVaadin/node/task/NodeSetupTask.kt
+++ b/src/dorkbox/gradleVaadin/node/task/NodeSetupTask.kt
@ -1,6 +1,5 @@
 package dorkbox.gradleVaadin.node.task

-import com.dorkbox.version.Version
 import com.vaadin.flow.server.Constants
 import com.vaadin.flow.server.frontend.Util
 import dorkbox.gradleVaadin.JsonPackageTools
@ -11,6 +10,7 @@ import dorkbox.gradleVaadin.node.util.PlatformHelper
 import dorkbox.gradleVaadin.node.util.PlatformHelper.Companion.validateToolVersion
 import dorkbox.gradleVaadin.node.util.ProjectApiHelper
 import dorkbox.gradleVaadin.node.variant.VariantComputer
+import dorkbox.version.Version
 import elemental.json.Json
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
@ -295,11 +295,11 @@ abstract class NodeSetupTask : DefaultTask() {
                println("\t\tNODE Detected: $detectedVersion")
            }

-            var parsedVersion = Version.from(detectedVersion)
+            var parsedVersion = Version(detectedVersion)
            detectedNodeVersion = detectedVersion

            @Suppress("DEPRECATION")
-            val SUPPORTED_NODE_VERSION = Version.from(Constants.SUPPORTED_NODE_MAJOR_VERSION, Constants.SUPPORTED_NODE_MINOR_VERSION)
+            val SUPPORTED_NODE_VERSION = Version(Constants.SUPPORTED_NODE_MAJOR_VERSION, Constants.SUPPORTED_NODE_MINOR_VERSION)
            val nodeIsOK = validateToolVersion("node", parsedVersion, SUPPORTED_NODE_VERSION, silent)

            if (!nodeIsOK) {
@ -325,11 +325,11 @@ abstract class NodeSetupTask : DefaultTask() {
                return false
            }

-            parsedVersion = Version.from(detectedVersion)
+            parsedVersion = Version(detectedVersion)
            detectedNpmVersion = detectedVersion

            @Suppress("DEPRECATION")
-            val SUPPORTED_NPM_VERSION = Version.from(Constants.SUPPORTED_NPM_MAJOR_VERSION, Constants.SUPPORTED_NPM_MINOR_VERSION)
+            val SUPPORTED_NPM_VERSION = Version(Constants.SUPPORTED_NPM_MAJOR_VERSION, Constants.SUPPORTED_NPM_MINOR_VERSION)
            val npmIsOK = validateToolVersion("npm", parsedVersion, SUPPORTED_NPM_VERSION, silent)

            if (!npmIsOK) {
--- a/src/dorkbox/gradleVaadin/node/util/PlatformHelper.kt
+++ b/src/dorkbox/gradleVaadin/node/util/PlatformHelper.kt
@ -1,10 +1,10 @@
 package dorkbox.gradleVaadin.node.util

-import com.dorkbox.version.Version
 import com.vaadin.flow.server.frontend.FrontendTools
 import com.vaadin.flow.server.frontend.FrontendUtils
 import com.vaadin.flow.server.frontend.FrontendVersion
 import dorkbox.executor.Executor
+import dorkbox.version.Version
 import java.io.IOException
 import java.util.*
 import java.util.stream.*
@ -84,8 +84,8 @@ open class PlatformHelper constructor(private val props: Properties = System.get
            throw IllegalStateException(
                buildTooOldString(
                    tool, toolVersion.toString(),
-                    supported.majorVersion.toInt(),
-                    supported.minorVersion.toInt()
+                    supported.major.toInt(),
+                    supported.minor.toInt()
                )
            )
        }