From 25298f0155871d87cef43ff3993a884b07558147 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 May 2024 12:47:15 -0700 Subject: [PATCH 01/13] add NOTICE file (#90) happened to "notice" just now that we only LICENSE. standard practice is to have both --- NOTICE | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 NOTICE diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..57a82d8 --- /dev/null +++ b/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. From 4a9ff4fdc853bf750b192420eec18ca7a4a83d09 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:41:29 +0200 Subject: [PATCH 02/13] Update scala-library to 2.12.19 (#85) --- .travis.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a96fac7..a9debd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ import: scala/scala-dev:travis/default.yml language: scala -scala: 2.12.15 +scala: 2.12.19 env: global: diff --git a/build.sbt b/build.sbt index c6aa89e..c0535df 100644 --- a/build.sbt +++ b/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( From 1b79556b3c11ad2a7981666c3b4d3da74a0bfd9d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:41:47 +0200 Subject: [PATCH 03/13] Update sbt-dynver to 5.0.1 (#78) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ea6ed5a..75aa68e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") +addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") From 585490ef670b3b853566af8c494bc0d05ecf8602 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:42:21 +0200 Subject: [PATCH 04/13] Update better-files to 3.9.2 (#74) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c0535df..ffa6c2e 100644 --- a/build.sbt +++ b/build.sbt @@ -22,7 +22,7 @@ lazy val core = project.in(file("core")) 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.3.3", "mysql" % "mysql-connector-java" % "8.0.28" % "optional", "com.h2database" % "h2" % "2.1.210" % "optional", From 0c0ded3e3e1aec7331c3dce825925fc8bf381bed Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:42:42 +0200 Subject: [PATCH 05/13] Update typesafe:config to 1.4.3 (#82) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ffa6c2e..a1a4d99 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ lazy val core = project.in(file("core")) "com.typesafe.slick" %% "slick" % "3.3.3", "mysql" % "mysql-connector-java" % "8.0.28" % "optional", "com.h2database" % "h2" % "2.1.210" % "optional", - "com.typesafe" % "config" % "1.4.1", + "com.typesafe" % "config" % "1.4.3", "org.slf4j" % "slf4j-api" % "1.7.33", "ch.qos.logback" % "logback-classic" % "1.2.10", "com.github.sbt" % "junit-interface" % "0.13.3" % "test" From 5617f7c1395f6ee5f26b557afb72f189d8f8f5e1 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:42:54 +0200 Subject: [PATCH 06/13] Update sbt to 1.6.2 (#51) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 3161d21..c8fcab5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.1 +sbt.version=1.6.2 From 5e5c59feaf2700373a162abc99251019e23f8c93 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:43:32 +0200 Subject: [PATCH 07/13] Update slf4j-api to 1.7.36 (#53) Co-authored-by: Seth Tisue --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a1a4d99..2adc331 100644 --- a/build.sbt +++ b/build.sbt @@ -27,7 +27,7 @@ lazy val core = project.in(file("core")) "mysql" % "mysql-connector-java" % "8.0.28" % "optional", "com.h2database" % "h2" % "2.1.210" % "optional", "com.typesafe" % "config" % "1.4.3", - "org.slf4j" % "slf4j-api" % "1.7.33", + "org.slf4j" % "slf4j-api" % "1.7.36", "ch.qos.logback" % "logback-classic" % "1.2.10", "com.github.sbt" % "junit-interface" % "0.13.3" % "test" ), From a0a2e5b12b6f7382fe4dd867328b7849220a5bd1 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:44:07 +0200 Subject: [PATCH 08/13] Update logback-classic to 1.2.13 (#83) Co-authored-by: Seth Tisue --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 2adc331..ef8779a 100644 --- a/build.sbt +++ b/build.sbt @@ -28,7 +28,7 @@ lazy val core = project.in(file("core")) "com.h2database" % "h2" % "2.1.210" % "optional", "com.typesafe" % "config" % "1.4.3", "org.slf4j" % "slf4j-api" % "1.7.36", - "ch.qos.logback" % "logback-classic" % "1.2.10", + "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"), From 7ce5dfea50410c1363235abb43a852085ab097bb Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:44:45 +0200 Subject: [PATCH 09/13] Update sbt-buildinfo to 0.12.0 (#88) Co-authored-by: Seth Tisue --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 75aa68e..20da098 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") From 6dc8a31ebb94d2085c59e9d9d8ac88f1278ae620 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:45:27 +0200 Subject: [PATCH 10/13] Update h2 to 2.1.212 (#57) Co-authored-by: Seth Tisue --- build.sbt | 2 +- plugin/src/sbt-test/benchdb/simple/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index ef8779a..b7c5d5b 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ lazy val core = project.in(file("core")) "com.github.pathikrit" %% "better-files" % "3.9.2", "com.typesafe.slick" %% "slick" % "3.3.3", "mysql" % "mysql-connector-java" % "8.0.28" % "optional", - "com.h2database" % "h2" % "2.1.210" % "optional", + "com.h2database" % "h2" % "2.1.212" % "optional", "com.typesafe" % "config" % "1.4.3", "org.slf4j" % "slf4j-api" % "1.7.36", "ch.qos.logback" % "logback-classic" % "1.2.13", diff --git a/plugin/src/sbt-test/benchdb/simple/build.sbt b/plugin/src/sbt-test/benchdb/simple/build.sbt index f3901fc..655568f 100644 --- a/plugin/src/sbt-test/benchdb/simple/build.sbt +++ b/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.212" From b9d5669a7ca4f5f81cee9fe73e34b53a8017bdb2 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:46:47 +0200 Subject: [PATCH 11/13] Update mysql-connector-java to 8.0.33 (#77) Co-authored-by: Seth Tisue --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b7c5d5b..7ae9c57 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ lazy val core = project.in(file("core")) "com.monovore" %% "decline" % "2.2.0", "com.github.pathikrit" %% "better-files" % "3.9.2", "com.typesafe.slick" %% "slick" % "3.3.3", - "mysql" % "mysql-connector-java" % "8.0.28" % "optional", + "mysql" % "mysql-connector-java" % "8.0.33" % "optional", "com.h2database" % "h2" % "2.1.212" % "optional", "com.typesafe" % "config" % "1.4.3", "org.slf4j" % "slf4j-api" % "1.7.36", From 9f22912fbaee77042f7c0bc4f6d2732a9013f134 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:47:36 +0200 Subject: [PATCH 12/13] Update h2 to 2.1.214 (#59) Co-authored-by: Seth Tisue --- build.sbt | 2 +- plugin/src/sbt-test/benchdb/simple/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 7ae9c57..fc9e356 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ lazy val core = project.in(file("core")) "com.github.pathikrit" %% "better-files" % "3.9.2", "com.typesafe.slick" %% "slick" % "3.3.3", "mysql" % "mysql-connector-java" % "8.0.33" % "optional", - "com.h2database" % "h2" % "2.1.212" % "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", diff --git a/plugin/src/sbt-test/benchdb/simple/build.sbt b/plugin/src/sbt-test/benchdb/simple/build.sbt index 655568f..235f24d 100644 --- a/plugin/src/sbt-test/benchdb/simple/build.sbt +++ b/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.212" +benchdbDependencies += "com.h2database" % "h2" % "2.1.214" From b368f3efe634befe6492aa22a811761b26f1f2f4 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 4 Jun 2024 10:56:40 -0500 Subject: [PATCH 13/13] enable GitHub Actions (+ delete old Travis-CI config) (#92) fixes #91 --- .github/workflows/ci.yml | 20 ++++++++++++++++++++ .travis.yml | 14 -------------- 2 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..5358ae6 --- /dev/null +++ b/.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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a9debd5..0000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: ~> 1.0 # needed for imports - -import: scala/scala-dev:travis/default.yml - -language: scala - -scala: 2.12.19 - -env: - global: - - ADOPTOPENJDK=8 - -script: - - sbt core/publishLocal plugin/publishLocal