Moved the Desktop enhancement class to its own project. Removed depen…

…dency on JNA
dorkbox · Jan 12, 2023 · 4f3f644 · 4f3f644
1 parent 7cce99c
commit 4f3f644
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 439 deletions.
diff --git a/LICENSE b/LICENSE
@@ -125,18 +125,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
@@ -348,84 +336,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 - Utilities for use within Java projects
-       [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
-
      - NetworkUtils - Utilities for managing network configurations, IP/MAC address conversion, and ping (via OS native commands)
        [The Apache Software License, Version 2.0]
        https://git.dorkbox.com/dorkbox/NetworkUtils

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,10 +25,10 @@ import java.time.Instant
 gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS   // always show the stacktrace!
 
 plugins {
-    id("com.dorkbox.GradleUtils") version "3.5"
+    id("com.dorkbox.GradleUtils") version "3.6"
     id("com.dorkbox.Licensing") version "2.17"
     id("com.dorkbox.VersionUpdate") version "2.5"
-    id("com.dorkbox.GradlePublish") version "1.14"
+    id("com.dorkbox.GradlePublish") version "1.15"
 
     kotlin("jvm") version "1.7.20"
 }
@@ -163,16 +163,11 @@ dependencies {
 
     api("com.dorkbox:Collections:1.2")
     api("com.dorkbox:Executor:3.11")
-    api("com.dorkbox:JNA:1.0")
     api("com.dorkbox:NetworkUtils:2.19.1")
     api("com.dorkbox:OS:1.6")
     api("com.dorkbox:Updates:1.1")
 
 
-    val jnaVersion = "5.12.1"
-    compileOnly("net.java.dev.jna:jna-jpms:$jnaVersion")
-    compileOnly("net.java.dev.jna:jna-platform-jpms:$jnaVersion")
-
     // https://github.com/cowtowncoder/java-uuid-generator
     // Java UUID class doesn't expose time/location versions, has a flawed compareTo() on 64bit, and is slow. This one is also thread safe.
     api("com.fasterxml.uuid:java-uuid-generator:4.0.1")