Merge remote-tracking branch 'origin/main' into update/slick-3.5.1

.github/workflows/ci.yml

@@ -0,0 +1,20 @@
+name: test
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: coursier/cache-action@v6
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 11
+    - name: Test
+      run: sbt core/publishLocal plugin/publishLocal

NOTICE

@@ -0,0 +1,13 @@
+Copyright 2020-2024 Lightbend, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

build.sbt

@@ -4,7 +4,7 @@ lazy val root = project.in(file("."))
   .settings(inThisBuild(Seq(
     organization := "com.lightbend.benchdb",
     //version := "0.1-SNAPSHOT",
-    scalaVersion := "2.12.15",
+    scalaVersion := "2.12.19",
     scalacOptions ++= Seq("-deprecation", "-unchecked"),
   )))
   .settings(
@@ -20,15 +20,13 @@ lazy val core = project.in(file("core"))
     buildInfoKeys := Seq[BuildInfoKey](version),
     buildInfoPackage := "com.lightbend.benchdb",
     libraryDependencies ++= Seq(
-      "org.eclipse.jgit" % "org.eclipse.jgit" % "6.0.0.202111291000-r",
-      "com.monovore" %% "decline" % "2.2.0",
-      "com.github.pathikrit" %% "better-files" % "3.9.1",
+      "com.github.pathikrit" %% "better-files" % "3.9.2",
       "com.typesafe.slick" %% "slick" % "3.5.1",
-      "mysql" % "mysql-connector-java" % "8.0.28" % "optional",
-      "com.h2database" % "h2" % "2.1.210" % "optional",
-      "com.typesafe" % "config" % "1.4.1",
-      "org.slf4j" % "slf4j-api" % "1.7.33",
-      "ch.qos.logback" % "logback-classic" % "1.2.10",
+      "mysql" % "mysql-connector-java" % "8.0.33" % "optional",
+      "com.h2database" % "h2" % "2.1.214" % "optional",
+      "com.typesafe" % "config" % "1.4.3",
+      "org.slf4j" % "slf4j-api" % "1.7.36",
+      "ch.qos.logback" % "logback-classic" % "1.2.13",
       "com.github.sbt" % "junit-interface" % "0.13.3" % "test"
     ),
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a"),

plugin/src/sbt-test/benchdb/simple/build.sbt

@@ -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.1.210"
+benchdbDependencies += "com.h2database" % "h2" % "2.1.214"

project/build.properties

@@ -1 +1 @@
-sbt.version=1.6.1
+sbt.version=1.6.2

project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
+addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")