From 7577880b5bf053c7284ad9991f0761d9b8e09715 Mon Sep 17 00:00:00 2001 From: Robinson Date: Wed, 7 Jun 2023 23:03:53 +0200 Subject: [PATCH] Updated license, updated build deps --- LICENSE | 8 ++++---- build.gradle.kts | 18 +++++++----------- src9/module-info.java | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/LICENSE b/LICENSE index 298d404..02aa61d 100644 --- a/LICENSE +++ b/LICENSE @@ -33,13 +33,13 @@ - SLF4J - Simple facade or abstraction for various logging frameworks [MIT License] - http://www.slf4j.org + https://www.slf4j.org Copyright 2023 QOS.ch - Logback - Logback is a logging framework for Java applications [The Apache Software License, Version 2.0] - http://logback.qos.ch + https://logback.qos.ch Copyright 2023 QOS.ch @@ -63,13 +63,13 @@ - JZlib - [The Apache Software License, Version 2.0] - http://www.jcraft.com/jzlib + https://github.com/ymnk/jzlib Atsuhiko Yamanaka JCraft, Inc. - Bouncy Castle Crypto - [The Apache Software License, Version 2.0] - http://www.bouncycastle.org + https://www.bouncycastle.org The Legion of the Bouncy Castle Inc - ed25519-java - diff --git a/build.gradle.kts b/build.gradle.kts index 891432e..4998461 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,8 +14,6 @@ * limitations under the License. */ -import java.time.Instant - /////////////////////////////// ////// PUBLISH TO SONATYPE / MAVEN CENTRAL ////// TESTING : (to local maven repo) <'publish and release' - 'publishToMavenLocal'> @@ -25,10 +23,10 @@ import java.time.Instant gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS // always show the stacktrace! plugins { - id("com.dorkbox.GradleUtils") version "3.9" - id("com.dorkbox.Licensing") version "2.19.1" - id("com.dorkbox.VersionUpdate") version "2.5" - id("com.dorkbox.GradlePublish") version "1.17" + id("com.dorkbox.GradleUtils") version "3.17" + id("com.dorkbox.Licensing") version "2.22" + id("com.dorkbox.VersionUpdate") version "2.8" + id("com.dorkbox.GradlePublish") version "1.18" kotlin("jvm") version "1.8.0" } @@ -44,10 +42,8 @@ object Extras { const val vendorUrl = "https://dorkbox.com" const val url = "https://git.dorkbox.com/dorkbox/Executor" - val buildDate = Instant.now().toString() - - const val coroutineVer = "1.6.4" - const val sshjVer = "0.34.0" + const val coroutineVer = "1.7.1" + const val sshjVer = "0.35.0" } /////////////////////////////// @@ -104,7 +100,7 @@ tasks.jar.get().apply { attributes["Specification-Vendor"] = Extras.vendor attributes["Implementation-Title"] = "${Extras.group}.${Extras.id}" - attributes["Implementation-Version"] = Extras.buildDate + attributes["Implementation-Version"] = GradleUtils.now() attributes["Implementation-Vendor"] = Extras.vendor } } diff --git a/src9/module-info.java b/src9/module-info.java index 2356c9f..6d4fcdb 100644 --- a/src9/module-info.java +++ b/src9/module-info.java @@ -14,6 +14,6 @@ module dorkbox.executor { requires static com.hierynomus.sshj; requires static ch.qos.logback.classic; + requires transitive kotlinx.coroutines.core; requires transitive kotlin.stdlib; - requires transitive kotlinx.coroutines.core.jvm; }