From 16bb5e52dbab4e22c0bfdba43c6b888ca6729029 Mon Sep 17 00:00:00 2001
From: Miguel Branco <miguel@raw-labs.com>
Date: Tue, 10 Sep 2024 16:12:27 +0200
Subject: [PATCH] Various cleanings.

---
 build.sbt                      | 32 +++++++++++++++-----------------
 project/plugins.sbt            | 11 +++++++++++
 src/main/java/module-info.java | 16 +++++-----------
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/build.sbt b/build.sbt
index 575d215..c95a5a5 100644
--- a/build.sbt
+++ b/build.sbt
@@ -119,32 +119,30 @@ lazy val strictBuildSettings = commonSettings ++ compileSettings ++ buildSetting
 )
 
 lazy val root = (project in file("."))
+  .doPatchDependencies() // Patch Scala dependencies to ensure their names are JPMS-friendly.
   .settings(
     name := "utils-core",
     strictBuildSettings,
     publishSettings,
     libraryDependencies ++= Seq(
-      "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5-rawlabs",
-      "com.typesafe" % "config" % "1.4.2",
+      // Logging
+      "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
       "ch.qos.logback" % "logback-classic" % "1.4.12",
-      "com.google.guava" % "guava" % "32.1.3-jre",
-      "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2", // Required while we are on Scala 2.12. It's built into Scala 2.13.
-      "com.github.loki4j" % "loki-logback-appender" % "1.4.2",
-      "commons-io" % "commons-io" % "2.11.0",
-      "org.apache.commons" % "commons-text" % "1.11.0",
       "org.slf4j" % "slf4j-api" % "2.0.5",
       "org.slf4j" % "log4j-over-slf4j" % "2.0.5",
       "org.slf4j" % "jcl-over-slf4j" % "2.0.5",
       "org.slf4j" % "jul-to-slf4j" % "2.0.5",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.15.2",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.15.2",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.15.2",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.15.2",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.15.2",
-      "com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor" % "2.15.2",
-      "com.fasterxml.jackson.dataformat" % "jackson-dataformat-csv" % "2.15.2",
-      "com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % "2.15.2",
-      "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.15.2-rawlabs",
+      "com.github.loki4j" % "loki-logback-appender" % "1.4.2",
+      // Configuration
+      "com.typesafe" % "config" % "1.4.2",
+      // Utilities
+      "com.google.guava" % "guava" % "32.1.3-jre",
+      "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2", 
+      "commons-io" % "commons-io" % "2.11.0",
+      "org.apache.commons" % "commons-text" % "1.11.0",
+      // Required while we are on Scala 2.12.
+      "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2",
+      // Testing
       "org.scalatest" %% "scalatest" % "3.2.16" % Test
     )
-  )
\ No newline at end of file
+  )
diff --git a/project/plugins.sbt b/project/plugins.sbt
index c5b285c..f557dc5 100755
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -13,3 +13,14 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
 
 addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
+
+resolvers += "RAW Labs GitHub Packages" at "https://maven.pkg.github.com/raw-labs/sbt-module-patcher"
+
+ThisBuild / credentials += Credentials(
+  "GitHub Package Registry",
+  "maven.pkg.github.com",
+  "raw-labs",
+  sys.env.getOrElse("GITHUB_TOKEN", "")
+)
+
+addSbtPlugin("com.raw-labs" % "sbt-module-patcher" % "0.1.1")
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 75e2930..5dd09b9 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -12,21 +12,15 @@
 
 module raw.utils.core {
   requires scala.library;
-  requires com.fasterxml.jackson.core;
-  requires com.fasterxml.jackson.databind;
-  requires com.fasterxml.jackson.dataformat.csv;
-  requires com.fasterxml.jackson.scala;
+  requires scala.logging;
+  requires ch.qos.logback.classic;
+  requires org.slf4j;
+  requires jul.to.slf4j;
+  requires typesafe.config;
   requires org.apache.commons.io;
   requires org.apache.commons.text;
-  requires typesafe.config;
-  requires typesafe.scalalogging;
-  requires org.slf4j;
-  requires ch.qos.logback.classic;
   requires com.google.common;
-  requires jul.to.slf4j;
 
   exports com.rawlabs.utils.core;
 
-  opens com.rawlabs.utils.core to
-      com.fasterxml.jackson.databind;
 }