fix modules (#21)

wakingrufus · May 11, 2023 · e738f37 · e738f37
1 parent 327dab2
commit e738f37
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -10,7 +10,7 @@ java {
 }
 
 dependencies {
-    implementation("org.slf4j:slf4j-api:1.7.30")
+    implementation("org.slf4j:slf4j-api:2.0.7")
     api("net.jthink:jaudiotagger:3.0.1")
     implementation(kotlin("reflect"))
 }

diff --git a/common/src/main/java/module-info.java b/common/src/main/java/module-info.java
@@ -2,7 +2,7 @@
     exports com.github.wakingrufus.jamm.common;
 
     requires jaudiotagger;
-    requires kotlin.stdlib.jdk8;
+    requires kotlin.stdlib;
     requires kotlin.reflect;
     requires java.logging;
     requires org.slf4j;

diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
@@ -11,10 +11,9 @@ project.description = "JavaFx Music Manager"
 dependencies {
     implementation(project(":common"))
     implementation(kotlin("reflect"))
-    implementation("org.slf4j:slf4j-api:1.7.30")
-    implementation("io.github.microutils:kotlin-logging-jvm:3.0.2")
-    implementation("ch.qos.logback:logback-classic:1.2.9")
-    implementation("ch.qos.logback:logback-core:1.2.9")
+    implementation("org.slf4j:slf4j-api:2.0.7")
+    implementation("io.github.microutils:kotlin-logging-jvm:3.0.5")
+    implementation("ch.qos.logback:logback-classic:1.4.7")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-javafx:1.6.4")
     implementation("com.github.trilarion:java-vorbis-support:1.2.1")
@@ -68,6 +67,7 @@ jlink {
         requires("java.desktop")
         requires("java.instrument")
         requires("jdk.jfr")
+        requires("org.slf4j")
         requires("jdk.unsupported")
         requires("jdk.crypto.ec")
         provides("javax.sound.sampled.spi.AudioFileReader")

diff --git a/desktop/src/main/java/module-info.java b/desktop/src/main/java/module-info.java
@@ -18,7 +18,6 @@
     requires fuel.json;
     requires org.json;
     requires commons.csv;
-    requires kotlin.logging.jvm;
     requires org.controlsfx.controls;
 
     exports com.github.wakingrufus.jamm.desktop;