Skip to content

Commit

Permalink
Update Scala and Slick versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
lastland committed Jan 18, 2020
1 parent 7c01c32 commit fbb0b90
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 17 deletions.
26 changes: 13 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
val repoKind = SettingKey[String]("repo-kind",
"Maven repository kind (\"snapshots\" or \"releases\")")

lazy val slickVersion = "3.2.1"
lazy val slickVersion = "3.3.2"

def coreDependencies(scalaVersion: String) = List(
"org.scala-lang" % "scala-compiler" % scalaVersion,
Expand All @@ -12,28 +12,28 @@ def coreDependencies(scalaVersion: String) = List(
lazy val slickDependencies = List(
"com.typesafe.slick" %% "slick" % slickVersion,
"com.typesafe.slick" %% "slick-codegen" % slickVersion,
"io.github.nafg" %% "slick-migration-api" % "0.4.0-M1"
"io.github.nafg" %% "slick-migration-api" % "0.7.0"
)

lazy val slickDependenciesWithTests = slickDependencies ++ List(
"org.scalatest" %% "scalatest" % "3.0.1",
"com.lihaoyi" %% "ammonite-ops" % "0.8.2",
"commons-io" % "commons-io" % "2.4",
"org.scalatest" %% "scalatest" % "3.1.0",
"com.lihaoyi" %% "ammonite-ops" % "2.0.4",
"commons-io" % "commons-io" % "2.6",
"com.typesafe.slick" %% "slick-hikaricp" % slickVersion,
"com.h2database" % "h2" % "1.4.192",
"org.xerial" % "sqlite-jdbc" % "3.8.11.2",
"mysql" % "mysql-connector-java" % "5.1.39",
"org.postgresql" % "postgresql" % "9.4.1209",
"org.hsqldb" % "hsqldb" % "2.3.4",
"org.apache.derby" % "derby" % "10.11.1.1"
"com.h2database" % "h2" % "1.4.200",
"org.xerial" % "sqlite-jdbc" % "3.30.1",
"mysql" % "mysql-connector-java" % "8.0.18",
"org.postgresql" % "postgresql" % "42.2.9",
"org.hsqldb" % "hsqldb" % "2.5.0",
"org.apache.derby" % "derby" % "10.15.1.3"
).map(_ % "test")

lazy val commonSettings = Seq(
organization := "com.liyaos",
licenses := Seq("Apache 2.0" ->
url("https://github.com/lastland/scala-forklift/blob/master/LICENSE")),
homepage := Some(url("https://github.com/lastland/scala-forklift")),
scalaVersion := "2.12.1",
scalaVersion := "2.13.1",
scalacOptions += "-deprecation",
scalacOptions += "-feature",
resolvers += Resolver.bintrayRepo("naftoligug", "maven"),
Expand Down Expand Up @@ -62,7 +62,7 @@ lazy val commonSettings = Seq(

lazy val root = Project(
"scala-forklift", file(".")).settings(
crossScalaVersions := Seq("2.12.1", "2.11.8"),
crossScalaVersions := Seq("2.13.1", "2.12.1"),
publishArtifact := false).aggregate(
coreProject, slickMigrationProject, plainMigrationProject, gitToolProject)

Expand Down
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ machine:
version: 2.7.9
dependencies:
pre:
- wget -q https://dl.bintray.com/sbt/debian/sbt-0.13.13.deb
- sudo dpkg -i sbt-0.13.13.deb
- wget -q https://dl.bintray.com/sbt/debian/sbt-1.3.7.deb
- sudo dpkg -i sbt-1.3.7.deb
cache_directories:
- "~/.ivy2"
- "~/.sbt"
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=0.13.13
sbt.version=1.3.7
1 change: 0 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")

0 comments on commit fbb0b90

Please sign in to comment.