Skip to content

Commit

Permalink
automatic module name for jinjava (#417)
Browse files Browse the repository at this point in the history
  • Loading branch information
datYori authored Apr 29, 2024
1 parent 2ad2dcb commit 005f8f6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,6 @@ lazy val jinjaSqlClient = (project in file("jinja-sql-client"))
commonSettings,
missingInterpolatorCompileSettings,
testSettings,
Compile / packageBin / packageOptions += Package.ManifestAttributes("Automatic-Module-Name" -> "raw.python.jinja-sql"),
libraryDependencies ++= Seq(
jinjava
)
Expand Down
8 changes: 6 additions & 2 deletions deps/others/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ val jacksonModuleScala = "com.fasterxml.jackson.module" %% "jackson-module-scala

val mysqlModule = "com.mysql" % "mysql-connector-j" % "8.1.0"

val jinjava = "com.hubspot.jinjava" % "jinjava" % "2.7.2" exclude("com.google.code.findbugs", "annotations")

libraryDependencies ++= Seq(
jwtCore,
scalaLogging,
jacksonModuleScala,
mysqlModule
mysqlModule,
jinjava
)

// Map of artifact ID to module name
Expand All @@ -26,6 +29,7 @@ val moduleNames = Map(
"scala-logging" -> "typesafe.scalalogging",
"jackson-module-scala" -> "com.fasterxml.jackson.scala",
"mysql-connector-j" -> "mysql.connector.j",
"jinjava" -> "jinjava"
)

def updatePom(pomFile: File, newVersion: String): Unit = {
Expand Down Expand Up @@ -157,4 +161,4 @@ createS3SyncScript := {

// Notify that the task is completed
println(s"Bash script created: $scriptFile")
}
}
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@ object Dependencies {
// from sql-client
val hikariCP = "com.zaxxer" % "HikariCP" % "5.1.0"

val jinjava = "com.hubspot.jinjava" % "jinjava" % "2.7.2" exclude("com.google.code.findbugs", "annotations")
val jinjava = "com.hubspot.jinjava" % "jinjava" % "2.7.2-rawlabs" exclude("com.google.code.findbugs", "annotations")
}

0 comments on commit 005f8f6

Please sign in to comment.