Fixed imports, updated license.

2023-01-15 00:49:31 +01:00 · 2023-01-15 00:49:31 +01:00 · b38cecff17
parent a8be63130f
commit b38cecff17
5 changed files with 321 additions and 20 deletions
--- a/326
+++ b/326
@ -141,6 +141,320 @@
               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

+     - Desktop - Native Desktop enhancements beyond the java.Desktop standard class, Java 1.8+
+       [The Apache Software License, Version 2.0]
+       https://git.dorkbox.com/dorkbox/Desktop
+       Copyright 2023
+         Dorkbox LLC
+
+       Extra license information
+         - JNA - Simplified native library access for Java.
+           [The Apache Software License, Version 2.0]
+           https://github.com/twall/jna
+           Copyright 2023
+             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 2023
+             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 2022
+             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 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 2022
+                 QOS.ch
+
+             - SSHJ - SSHv2 library for Java
+               [The Apache Software License, Version 2.0]
+               https://github.com/hierynomus/sshj
+               Copyright 2022
+                 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]
+                   http://www.jcraft.com/jzlib
+                     Atsuhiko Yamanaka
+                     JCraft, Inc.
+
+                 - Bouncy Castle Crypto - 
+                   [The Apache Software License, Version 2.0]
+                   http://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
+
+         - JNA - Native JNA extensions for Linux, MacOS, and Windows, Java 1.8+
+           [The Apache Software License, Version 2.0]
+           https://git.dorkbox.com/dorkbox/JNA
+           Copyright 2023
+             Dorkbox LLC
+
+           Extra license information
+             - SLF4J - Simple facade or abstraction for various logging frameworks
+               [MIT License]
+               http://www.slf4j.org
+               Copyright 2023
+                 QOS.ch
+
+             - 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
+
+             - JNA - Simplified native library access for Java.
+               [The Apache Software License, Version 2.0]
+               https://github.com/twall/jna
+               Copyright 2023
+                 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 2023
+                 Timothy Wall
+
+             - 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
+               Copyright 2023
+                 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
+
+                 - 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
+
+             - 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
+           Copyright 2023
+             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
+
+             - 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
+
+         - 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
+
+     - JNA - Native JNA extensions for Linux, MacOS, and Windows, Java 1.8+
+       [The Apache Software License, Version 2.0]
+       https://git.dorkbox.com/dorkbox/JNA
+       Copyright 2023
+         Dorkbox LLC
+
+       Extra license information
+         - SLF4J - Simple facade or abstraction for various logging frameworks
+           [MIT License]
+           http://www.slf4j.org
+           Copyright 2023
+             QOS.ch
+
+         - 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
+
+         - JNA - Simplified native library access for Java.
+           [The Apache Software License, Version 2.0]
+           https://github.com/twall/jna
+           Copyright 2023
+             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 2023
+             Timothy Wall
+
+         - 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
+           Copyright 2023
+             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
+
+             - 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
+
+         - 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
+
     - Utilities - Utilities for use within Java projects
       [The Apache Software License, Version 2.0]
       https://git.dorkbox.com/dorkbox/Utilities
@ -268,18 +582,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

-         - JNA - Simplified native library access for Java.
-           [The Apache Software License, Version 2.0]
-           https://github.com/twall/jna
-           Copyright 2023
-             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 2023
-             Timothy Wall
-
         - Netty - An event-driven asynchronous network application framework
           [The Apache Software License, Version 2.0]
           https://netty.io
--- a/src9/module-info.java
+++ b/src9/module-info.java
@ -5,18 +5,17 @@ module dorkbox.systemtray {

    requires transitive dorkbox.collections;
    requires transitive dorkbox.executor;
+    requires transitive dorkbox.desktop;
+    requires transitive dorkbox.jna;
    requires transitive dorkbox.updates;
    requires transitive dorkbox.utilities;
    requires transitive dorkbox.os;

+    requires transitive org.javassist; // this is an automatic module name, and emits warnings when compiling. This is OK.
    requires transitive org.slf4j;

    requires transitive com.sun.jna;
    requires transitive com.sun.jna.platform;

-    requires transitive java.desktop;
-    requires kotlin.stdlib;
-
-    requires java.base;
-    requires org.javassist;
+    requires transitive kotlin.stdlib;
 }
--- a/test-javaFx/dorkbox/TestTrayJavaFX.java
+++ b/test-javaFx/dorkbox/TestTrayJavaFX.java
@ -28,7 +28,7 @@ import dorkbox.systemTray.MenuItem;
 import dorkbox.systemTray.Separator;
 import dorkbox.systemTray.SystemTray;
 import dorkbox.util.CacheUtil;
-import dorkbox.util.Desktop;
+import dorkbox.desktop.Desktop;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;
--- a/test-swt/dorkbox/TestTraySwt.java
+++ b/test-swt/dorkbox/TestTraySwt.java
@ -33,7 +33,7 @@ import dorkbox.systemTray.MenuItem;
 import dorkbox.systemTray.Separator;
 import dorkbox.systemTray.SystemTray;
 import dorkbox.util.CacheUtil;
-import dorkbox.util.Desktop;
+import dorkbox.desktop.Desktop;

 /**
 * Icons from 'SJJB Icons', public domain/CC0 icon set
--- a/test/dorkbox/TestTray.java
+++ b/test/dorkbox/TestTray.java
@ -27,7 +27,7 @@ import dorkbox.systemTray.MenuItem;
 import dorkbox.systemTray.Separator;
 import dorkbox.systemTray.SystemTray;
 import dorkbox.util.CacheUtil;
-import dorkbox.util.Desktop;
+import dorkbox.desktop.Desktop;

 /**
 * Icons from 'SJJB Icons', public domain/CC0 icon set