Fix modules

DenaryDev · Apr 28, 2024 · 5364e97 · 5364e97
1 parent a8137a6
commit 5364e97
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 2 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     implementation("com.github.johnrengelman:shadow:8.1.1")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
     implementation("gradle.plugin.org.cadixdev.gradle:licenser:0.6.1")
+    implementation("org.gradlex:extra-java-module-info:1.8")
 }
 
 tasks.withType<KotlinCompile>().configureEach {

diff --git a/buildSrc/src/main/kotlin/crystal.base.gradle.kts b/buildSrc/src/main/kotlin/crystal.base.gradle.kts
@@ -3,6 +3,13 @@ plugins {
     `maven-publish`
     id("com.github.johnrengelman.shadow")
     id("crystal.formatting")
+    id("org.gradlex.extra-java-module-info")
+}
+
+extraJavaModuleInfo {
+    failOnMissingModuleInfo.set(false)
+    automaticModule("io.leangen.geantyref:geantyref", "io.leangen.geantyref")
+    automaticModule("com.mysql:mysql-connector-j", "com.mysql")
 }
 
 tasks {

diff --git a/library/paper/serializers/build.gradle.kts b/library/paper/serializers/build.gradle.kts
@@ -13,5 +13,4 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation(libs.mockbukkit)
     testImplementation(libs.configurate.core)
-    //testImplementation(project(":paper:utils"))
 }
diff --git a/library/paper/serializers/src/main/java/module-info.java b/library/paper/serializers/src/main/java/module-info.java
@@ -11,7 +11,8 @@
     requires org.jetbrains.annotations;
     requires net.kyori.adventure.text.minimessage;
     requires net.kyori.adventure;
-    requires geantyref;
+    requires net.kyori.examination.api;
+    requires io.leangen.geantyref;
 
     exports me.denarydev.crystal.config;
     exports me.denarydev.crystal.config.serializers;

diff --git a/library/paper/utils/src/main/java/module-info.java b/library/paper/utils/src/main/java/module-info.java
@@ -10,6 +10,7 @@
     requires org.jetbrains.annotations;
     requires net.kyori.adventure;
     requires net.kyori.adventure.text.minimessage;
+    requires net.kyori.examination.api;
 
     exports me.denarydev.crystal.utils;
     exports me.denarydev.crystal.utils.item;

diff --git a/library/shared/database/src/main/java/module-info.java b/library/shared/database/src/main/java/module-info.java
@@ -12,7 +12,9 @@
     requires org.xerial.sqlitejdbc;
     requires com.h2database;
     requires com.zaxxer.hikari;
+    requires com.mysql;
     requires org.mariadb.jdbc;
+    requires org.postgresql.jdbc;
 
     exports me.denarydev.crystal.db;
     exports me.denarydev.crystal.db.settings;