Skip to content

Commit

Permalink
upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
barryoneill committed Oct 12, 2022
1 parent 5b1bd2b commit 49820af
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 40 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up JDK
uses: olafurpg/setup-scala@v12
uses: olafurpg/setup-scala@v13
with:
java-version: [email protected]
- name: Cache SBT
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cache/coursier/v1
~/.sbt
key: sbt-${{ hashFiles('**/build.sbt') }}
- name: Run tests
run: sbt +clean +test
run: sbt clean test
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: olafurpg/setup-scala@v12
- uses: actions/checkout@v3
- uses: olafurpg/setup-scala@v13
with:
java-version: [email protected]
- uses: olafurpg/setup-gpg@v3
- name: Publish
run: sbt ci-release
Expand Down
12 changes: 2 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@ import sbt.Keys.scalaSource
organization := "io.laserdisc"
name := "mysql-binlog-stream"

ThisBuild / scalaVersion := "2.13.6"

def commonOptions(scalaVersion: String) =
CrossVersion.partialVersion(scalaVersion) match {
case Some((2, 12)) =>
Seq("-Ypartial-unification", "-Xlint")
case _ =>
Seq("-Xlint:_,-byname-implicit")
}
ThisBuild / scalaVersion := "2.13.9"

lazy val commonSettings = Seq(
organization := "io.laserdisc",
Expand All @@ -37,7 +29,7 @@ lazy val commonSettings = Seq(
Test / resourceDirectory := baseDirectory.value / "test_resources",
Test / parallelExecution := false,
Test / fork := true,
scalacOptions ++= commonOptions(scalaVersion.value) ++ Seq(
scalacOptions ++= Seq(
"-encoding",
"UTF-8", // source files are in UTF-8
"-deprecation", // warn about use of deprecated APIs
Expand Down
36 changes: 18 additions & 18 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,36 @@ import sbt.Keys.{ libraryDependencies, _ }
import sbt._

object Dependencies {
val cirisVersion = "2.2.0"
val doobieVersion = "1.0.0-RC1"
val cirisVersion = "2.4.0"
val doobieVersion = "1.0.0-RC2"
val circeVersion = "0.14.1"
val catsEffectVersion = "3.2.9"
val catsEffectVersion = "3.3.14"

val TestLib = Seq(
libraryDependencies ++= Seq(
"org.scalamock" %% "scalamock" % "5.1.0" % Test,
"org.scalatest" %% "scalatest" % "3.2.10" % Test,
"com.dimafeng" %% "testcontainers-scala" % "0.39.11" % Test,
"org.testcontainers" % "mysql" % "1.16.2" % Test,
"org.testcontainers" % "testcontainers" % "1.16.2" % Test
"org.scalamock" %% "scalamock" % "5.2.0" % Test,
"org.scalatest" %% "scalatest" % "3.2.14" % Test,
"com.dimafeng" %% "testcontainers-scala" % "0.40.11" % Test,
"org.testcontainers" % "mysql" % "1.17.5" % Test,
"org.testcontainers" % "testcontainers" % "1.17.5" % Test
)
)

val Config = Seq(
libraryDependencies ++= Seq(
"is.cir" %% "ciris-enumeratum" % cirisVersion,
"is.cir" %% "ciris-refined" % cirisVersion,
"eu.timepit" %% "refined" % "0.9.27"
"eu.timepit" %% "refined" % "0.10.1"
)
)

val Logging = Seq(
libraryDependencies ++= Seq(
"ch.qos.logback" % "logback-classic" % "1.2.6",
"ch.qos.logback" % "logback-core" % "1.2.6",
"org.slf4j" % "jcl-over-slf4j" % "1.7.32",
"org.slf4j" % "jul-to-slf4j" % "1.7.32",
"org.typelevel" %% "log4cats-slf4j" % "2.1.1"
"ch.qos.logback" % "logback-classic" % "1.4.4",
"ch.qos.logback" % "logback-core" % "1.4.4",
"org.slf4j" % "jcl-over-slf4j" % "2.0.3",
"org.slf4j" % "jul-to-slf4j" % "2.0.3",
"org.typelevel" %% "log4cats-slf4j" % "2.5.0"
)
)

Expand All @@ -41,8 +41,8 @@ object Dependencies {
"org.tpolecat" %% "doobie-hikari" % doobieVersion, // HikariCP transactor.
"org.tpolecat" %% "doobie-refined" % doobieVersion, // Postgres driver 42.1.4 + type mappings.
"org.tpolecat" %% "doobie-scalatest" % doobieVersion % Test, // Support for doobie scalatest
"mysql" % "mysql-connector-java" % "8.0.27",
"com.zendesk" % "mysql-binlog-connector-java" % "0.25.4"
"mysql" % "mysql-connector-java" % "8.0.30",
"com.zendesk" % "mysql-binlog-connector-java" % "0.27.3"
)
)

Expand All @@ -64,8 +64,8 @@ object Dependencies {
val XML = Seq(
libraryDependencies ++= Seq(
"javax.xml.bind" % "jaxb-api" % "2.3.1",
"com.sun.xml.bind" % "jaxb-impl" % "3.0.2",
"com.sun.xml.bind" % "jaxb-core" % "3.0.2",
"com.sun.xml.bind" % "jaxb-impl" % "4.0.1",
"com.sun.xml.bind" % "jaxb-core" % "4.0.1",
"javax.activation" % "activation" % "1.1.1"
)
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.5
sbt.version=1.7.2
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.0")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.5")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")

0 comments on commit 49820af

Please sign in to comment.