diff --git a/LICENSE b/LICENSE index 0634904..e79da99 100644 --- a/LICENSE +++ b/LICENSE @@ -54,6 +54,12 @@ Copyright 2018 Venkat Peri + - kotlinx.coroutines - Library support for Kotlin coroutines with multiplatform support + [The Apache Software License, Version 2.0] + https://github.com/Kotlin/kotlinx.coroutines + Copyright 2023 + JetBrains s.r.o. + - Java Uuid Generator - A set of Java classes for working with UUIDs [The Apache Software License, Version 2.0] https://github.com/cowtowncoder/java-uuid-generator @@ -68,13 +74,6 @@ Lasse Collin Igor Pavlov - - Netty - An event-driven asynchronous network application framework - [The Apache Software License, Version 2.0] - https://netty.io - Copyright 2023 - The Netty Project - Contributors. See source NOTICE - - Kotlin - [The Apache Software License, Version 2.0] https://github.com/JetBrains/kotlin @@ -83,106 +82,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 - - kotlinx.coroutines - Library support for Kotlin coroutines with multiplatform support - [The Apache Software License, Version 2.0] - https://github.com/Kotlin/kotlinx.coroutines - Copyright 2023 - JetBrains s.r.o. - - - 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 2023 - Dorkbox LLC - - Extra license information - - ZT Process Executor - - [The Apache Software License, Version 2.0] - https://github.com/zeroturnaround/zt-exec - Copyright 2014 - ZeroTurnaround LLC - - - Apache Commons Exec - - [The Apache Software License, Version 2.0] - https://commons.apache.org/proper/commons-exec/ - Copyright 2014 - The Apache Software Foundation - - - 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 - - - kotlinx.coroutines - Library support for Kotlin coroutines with multiplatform support - [The Apache Software License, Version 2.0] - https://github.com/Kotlin/kotlinx.coroutines - Copyright 2023 - JetBrains s.r.o. - - - SLF4J - Simple facade or abstraction for various logging frameworks - [MIT License] - https://www.slf4j.org - Copyright 2023 - QOS.ch - - - Logback - Logback is a logging framework for Java applications - [The Apache Software License, Version 2.0] - https://logback.qos.ch - Copyright 2023 - QOS.ch - - - SSHJ - SSHv2 library for Java - [The Apache Software License, Version 2.0] - https://github.com/hierynomus/sshj - Copyright 2023 - Jeroen van Erp - SSHJ Contributors - - Extra license information - - Apache MINA - - [The Apache Software License, Version 2.0] - https://mina.apache.org/sshd-project/ - The Apache Software Foundation - - - Apache Commons-Net - - [The Apache Software License, Version 2.0] - https://commons.apache.org/proper/commons-net/ - The Apache Software Foundation - - - JZlib - - [The Apache Software License, Version 2.0] - https://github.com/ymnk/jzlib - Atsuhiko Yamanaka - JCraft, Inc. - - - Bouncy Castle Crypto - - [The Apache Software License, Version 2.0] - https://www.bouncycastle.org - The Legion of the Bouncy Castle Inc - - - ed25519-java - - [Public Domain, per Creative Commons CC0] - https://github.com/str4d/ed25519-java - https://github.com/str4d - - - 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 - - OS - Information about the system, Java runtime, OS, Window Manager, and Desktop Environment. [The Apache Software License, Version 2.0] https://git.dorkbox.com/dorkbox/OS diff --git a/LICENSE.MIT b/LICENSE.MIT deleted file mode 100644 index 2e9f5aa..0000000 --- a/LICENSE.MIT +++ /dev/null @@ -1,21 +0,0 @@ - MIT License - - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index d72ec9f..6146bf7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -127,9 +127,8 @@ tasks.jar.get().apply { // NOTE: compileOnly is used because there are some classes/dependencies that ARE NOT necessary to be included, UNLESS the user // is actually using that part of the library. If this happens, they will (or should) already be using the dependency) dependencies { - api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") + api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") - api("com.dorkbox:Executor:3.13") api("com.dorkbox:OS:1.6") api("com.dorkbox:Updates:1.1") @@ -148,8 +147,7 @@ dependencies { // api "com.koloboke:koloboke-api-jdk8:1.0.0" // runtime "com.koloboke:koloboke-impl-jdk8:1.0.0" - compileOnly("io.netty:netty-buffer:4.1.94.Final") -// compileOnly("net.jodah:typetools:0.6.3") +// compileOnly("io.netty:netty-buffer:4.1.96.Final") testImplementation("junit:junit:4.13.2") // testImplementation("ch.qos.logback:logback-classic:1.4.5") diff --git a/src/dorkbox/util/FileUtil.kt b/src/dorkbox/util/FileUtil.kt index 318fc86..9ba51c3 100644 --- a/src/dorkbox/util/FileUtil.kt +++ b/src/dorkbox/util/FileUtil.kt @@ -556,7 +556,6 @@ object FileUtil { /** * Copies a files from one location to another. Overwriting any existing file at the destination. */ - @JvmStatic @Throws(IOException::class) fun copyFile(`in`: File, out: File): File { val normalizedIn = `in`.normalize().absolutePath @@ -756,7 +755,6 @@ object FileUtil { * * @return true IFF the file/dir was deleted or didn't exist at first */ - @JvmStatic fun delete(file: File, vararg namesToIgnore: String): Boolean { if (!file.exists()) { return true diff --git a/src/dorkbox/util/ImageUtil.java b/src/dorkbox/util/ImageUtil.java index d26b499..a523aaf 100644 --- a/src/dorkbox/util/ImageUtil.java +++ b/src/dorkbox/util/ImageUtil.java @@ -162,7 +162,7 @@ class ImageUtil { } else { // suck it out of a URL/Resource (with debugging if necessary) - final URL systemResource = LocationResolver.getResource(fileName); + final URL systemResource = LocationResolver.Companion.getResource(fileName); image = new ImageIcon(systemResource).getImage(); } diff --git a/src/dorkbox/util/LocationResolver.kt b/src/dorkbox/util/LocationResolver.kt index 60d2d27..9399719 100644 --- a/src/dorkbox/util/LocationResolver.kt +++ b/src/dorkbox/util/LocationResolver.kt @@ -285,7 +285,6 @@ class LocationResolver { * * @return the URL for that given resource name */ - @JvmStatic fun getResource(resourceName: String): URL? { var resourceName = resourceName try { diff --git a/src/dorkbox/util/Message.java b/src/dorkbox/util/Message.java deleted file mode 100644 index 080c937..0000000 --- a/src/dorkbox/util/Message.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2010 dorkbox, llc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package dorkbox.util; - -public interface Message { - -} diff --git a/src/dorkbox/util/Sys.kt b/src/dorkbox/util/Sys.kt index 7013a48..58de8e8 100644 --- a/src/dorkbox/util/Sys.kt +++ b/src/dorkbox/util/Sys.kt @@ -279,7 +279,6 @@ object Sys { return b } - @JvmStatic fun concatBytes(vararg arrayBytes: ByteArray): ByteArray { var length = 0 for (bytes in arrayBytes) { diff --git a/src9/module-info.java b/src9/module-info.java index c910e53..a29f77f 100644 --- a/src9/module-info.java +++ b/src9/module-info.java @@ -9,7 +9,6 @@ module dorkbox.utilities { exports dorkbox.util.sync; exports dorkbox.util.userManagement; - requires transitive dorkbox.executor; requires transitive dorkbox.updates; requires transitive dorkbox.os;