Skip to content

Commit

Permalink
Merge branch 'main' into update/mysql-connector-j-9.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
SethTisue authored Oct 19, 2024
2 parents ec74e36 + 93ce8a2 commit c4a19ee
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
java-version: 17
- uses: sbt/setup-sbt@v1
- name: Test
run: sbt core/publishLocal plugin/publishLocal
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ lazy val root = project.in(file("."))
.settings(inThisBuild(Seq(
organization := "com.lightbend.benchdb",
//version := "0.1-SNAPSHOT",
scalaVersion := "2.13.14",
scalaVersion := "2.13.15",
scalacOptions ++= Seq("-deprecation", "-unchecked"),
)))
.settings(
Expand All @@ -20,15 +20,15 @@ lazy val core = project.in(file("core"))
buildInfoKeys := Seq[BuildInfoKey](version),
buildInfoPackage := "com.lightbend.benchdb",
libraryDependencies ++= Seq(
"org.eclipse.jgit" % "org.eclipse.jgit" % "6.10.0.202406032230-r",
"org.eclipse.jgit" % "org.eclipse.jgit" % "7.0.0.202409031743-r",
"com.monovore" %% "decline" % "2.4.1",
"com.github.pathikrit" %% "better-files" % "3.9.2",
"com.typesafe.slick" %% "slick" % "3.5.1",
"com.typesafe.slick" %% "slick" % "3.5.2",
"com.mysql" % "mysql-connector-j" % "9.1.0" % "optional",
"com.h2database" % "h2" % "2.2.224" % "optional",
"com.h2database" % "h2" % "2.3.232" % "optional",
"com.typesafe" % "config" % "1.4.3",
"org.slf4j" % "slf4j-api" % "2.0.13",
"ch.qos.logback" % "logback-classic" % "1.5.8",
"org.slf4j" % "slf4j-api" % "2.0.16",
"ch.qos.logback" % "logback-classic" % "1.5.11",
"com.github.sbt" % "junit-interface" % "0.13.3" % "test"
),
testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a"),
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/sbt-test/benchdb/simple/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ benchdbNoUserConfig := true
benchdbConfig += baseDirectory.value / "benchdb.conf"
// H2 requires an absolute path for the database so we have to add it as an override:
benchdbConfigOverride += "db.db.url" -> ("jdbc:h2:" + (baseDirectory.value / "benchdb-test-data").toPath.toAbsolutePath.toString)
benchdbDependencies += "com.h2database" % "h2" % "2.2.224"
benchdbDependencies += "com.h2database" % "h2" % "2.3.232"
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")

0 comments on commit c4a19ee

Please sign in to comment.