Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update slick, slick-hikaricp to 3.5.0 #499

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ lazy val commonSettings = Seq(

lazy val scalawiki = (project in file("."))
.settings(commonSettings)
.dependsOn(core, bots, dumps, wlx, sql, `http-extensions`)
.aggregate(core, bots, dumps, wlx, sql, `http-extensions`)
.dependsOn(core, bots, dumps, wlx, `http-extensions`)
.aggregate(core, bots, dumps, wlx, `http-extensions`)

lazy val core = Project("scalawiki-core", file("scalawiki-core"))
.settings(commonSettings: _*)
Expand Down Expand Up @@ -118,17 +118,6 @@ lazy val wlx = Project("scalawiki-wlx", file("scalawiki-wlx"))
assembly / mainClass := Some("org.scalawiki.wlx.stat.Statistics")
)

lazy val sql = Project("scalawiki-sql", file("scalawiki-sql"))
.dependsOn(core % "compile->compile;test->test")
.settings(commonSettings: _*)
.settings(
libraryDependencies ++= Seq(
Library.Slick.slick,
Library.Slick.hikaricp,
"com.h2database" % "h2" % H2V
)
)

lazy val `http-extensions` = (project in file("http-extensions"))
.settings(commonSettings: _*)
.settings(
Expand Down
7 changes: 0 additions & 7 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,6 @@ object Dependencies {
"com.fasterxml.jackson.core" % "jackson-databind" % JacksonV
}

object Slick {
val SlickV = "3.4.1"

val slick = "com.typesafe.slick" %% "slick" % SlickV
val hikaricp = "com.typesafe.slick" %% "slick-hikaricp" % SlickV
}

object Specs2 {
val SpecsV = "4.20.5"

Expand Down
19 changes: 0 additions & 19 deletions scalawiki-sql/src/main/resources/application.conf

This file was deleted.

4 changes: 0 additions & 4 deletions scalawiki-sql/src/main/resources/logback.xml

This file was deleted.

54 changes: 0 additions & 54 deletions scalawiki-sql/src/main/scala/org/scalawiki/sql/Categories.scala

This file was deleted.

212 changes: 0 additions & 212 deletions scalawiki-sql/src/main/scala/org/scalawiki/sql/DslQueryDbCache.scala

This file was deleted.

Loading
Loading