Skip to content

Commit

Permalink
upgrade slick
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Jan 13, 2025
1 parent 7f9e2a1 commit 03696b8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ jobs:
- { connector: pravega, java_version: 8, pre_cmd: 'docker compose up -d pravega'}
- { connector: reference, java_version: 8 }
- { connector: s3, java_version: 8 }
- { connector: spring-web, java_version: 8 }
- { connector: spring-web, java_version: 17 }
- { connector: simple-codecs, java_version: 8 }
- { connector: slick, java_version: 8 }
- { connector: slick, java_version: 11 }
- { connector: sns, java_version: 8, pre_cmd: 'docker compose up -d amazonsns' }
- { connector: solr, java_version: 8 }
- { connector: sqs, java_version: 8, pre_cmd: 'docker compose up -d elasticmq' }
Expand Down
2 changes: 0 additions & 2 deletions .scala-steward.conf
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ updates.pin = [
{ groupId = "com.lightbend.paradox", artifactId = "sbt-paradox", version = "0.9." }
# Pin logback to v1.3.x because v1.4.x needs JDK11
{ groupId = "ch.qos.logback", version="1.3." }
# Pin h2 to v2.2 because v2.3 needs JDK11
{ groupId = "com.h2database", version="2.2." }
# Newer versions need JDK 11 https://github.com/slick/slick/issues/3030
{ groupId = "com.typesafe.slick", version = "3.5.1" }
# https://github.com/apache/pekko-connectors/issues/503
Expand Down
10 changes: 7 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ lazy val userProjects: Seq[ProjectReference] = List[ProjectReference](
pravega,
reference,
s3,
springWeb,
simpleCodecs,
slick,
sns,
solr,
sqs,
Expand All @@ -67,7 +65,13 @@ lazy val userProjects: Seq[ProjectReference] = List[ProjectReference](
if (JdkOptions.isJdk11orHigher)
List[ProjectReference](
avroparquet,
googleCloudBigQueryStorage)
googleCloudBigQueryStorage,
slick)
else
Nil
} ++ {
if (JdkOptions.isJdk17orHigher)
List[ProjectReference](springWeb)
else
Nil
}
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ object Dependencies {
"org.springframework.boot" % "spring-boot-starter-web" % SpringBootVersion % Test))
}

val SlickVersion = "3.5.1"
val SlickVersion = "3.5.2"
val Slick = Seq(
// Transitive dependency `scala-reflect` to avoid `NoClassDefFoundError`.
// See: https://github.com/slick/slick/issues/2933
Expand All @@ -483,7 +483,7 @@ object Dependencies {
"com.typesafe.slick" %% "slick" % SlickVersion,
"com.typesafe.slick" %% "slick-hikaricp" % SlickVersion,
"ch.qos.logback" % "logback-classic" % LogbackVersion % Test,
"com.h2database" % "h2" % "2.2.224" % Test))
"com.h2database" % "h2" % "2.3.232" % Test))

val Eventbridge = Seq(
libraryDependencies ++= Seq(
Expand Down

0 comments on commit 03696b8

Please sign in to comment.