Skip to content

Commit

Permalink
Various cleanings.
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelbranco80 committed Sep 10, 2024
1 parent 3fa44cb commit 16bb5e5
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 28 deletions.
32 changes: 15 additions & 17 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
)
)
11 changes: 11 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
16 changes: 5 additions & 11 deletions src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

0 comments on commit 16bb5e5

Please sign in to comment.