From eed95f586edcc726b12d864048e2f4f9594530da Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Thu, 29 Dec 2022 16:49:38 +0100
Subject: [PATCH] Don't shadow gson

---
 commons-gson/build.gradle.kts               | 18 ++----------------
 commons-gson/src/main/java/module-info.java |  4 ++--
 muscript/src/main/java/module-info.java     |  2 +-
 src/main/java/module-info.java              |  2 +-
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/commons-gson/build.gradle.kts b/commons-gson/build.gradle.kts
index 71e7647..facba26 100644
--- a/commons-gson/build.gradle.kts
+++ b/commons-gson/build.gradle.kts
@@ -1,36 +1,22 @@
 plugins {
-    id("com.github.johnrengelman.shadow") version "7.1.2"
     id("commons.library")
 }
 
 dependencies {
-    shadow(implementation("io.gitlab.jfronny:gson:2.11.0-SNAPSHOT")!!)
+    implementation("io.gitlab.jfronny:gson:2.11.0-SNAPSHOT")
     implementation(project(":"))
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
 }
 
-tasks.shadowJar {
-    configurations.clear()
-    configurations.add(project.configurations.shadow.get())
-    archiveClassifier.set("")
-}
-
 publishing {
     publications {
         create<MavenPublication>("maven") {
             groupId = "io.gitlab.jfronny"
             artifactId = "commons-gson"
 
-            project.shadow.component(this)
-
-            pom.withXml {
-                val l = asElement().getElementsByTagName("dependency");
-                for (i in 0 until l.length) {
-                    l.item(i).parentNode.removeChild(l.item(i))
-                }
-            }
+            from(components["java"])
         }
     }
 }
diff --git a/commons-gson/src/main/java/module-info.java b/commons-gson/src/main/java/module-info.java
index acd7a3b..db2147e 100644
--- a/commons-gson/src/main/java/module-info.java
+++ b/commons-gson/src/main/java/module-info.java
@@ -1,7 +1,7 @@
 module io.gitlab.jfronny.commons.gson {
-    requires io.gitlab.jfronny.gson;
     requires io.gitlab.jfronny.commons;
-    requires org.jetbrains.annotations;
+    requires io.gitlab.jfronny.gson;
+    requires static org.jetbrains.annotations;
     exports io.gitlab.jfronny.commons.serialize.gson.api;
     exports io.gitlab.jfronny.commons.serialize.gson.api.v1;
 }
\ No newline at end of file
diff --git a/muscript/src/main/java/module-info.java b/muscript/src/main/java/module-info.java
index 44cf813..559cb2f 100644
--- a/muscript/src/main/java/module-info.java
+++ b/muscript/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 module io.gitlab.jfronny.commons.muscript {
     requires io.gitlab.jfronny.commons;
-    requires org.jetbrains.annotations;
+    requires static org.jetbrains.annotations;
     exports io.gitlab.jfronny.commons.data.dynamic;
     exports io.gitlab.jfronny.muscript;
     exports io.gitlab.jfronny.muscript.compiler;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 3749f02..e4aaeb9 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 module io.gitlab.jfronny.commons {
-    requires org.jetbrains.annotations;
+    requires static org.jetbrains.annotations;
     requires java.net.http;
     requires java.logging;
     exports io.gitlab.jfronny.commons;