From 3904da2e8e67eb03b7283530b8aa81574553bca5 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Fri, 22 Sep 2017 16:26:38 -0700 Subject: update plugin to use sbt 1.0 and scala 2.12 --- build.sbt | 10 ++-------- project/build.properties | 2 +- project/plugins.sbt | 4 ++-- src/main/scala/SchemaParser.scala | 4 ++-- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index 1959ef2..7cf3de0 100644 --- a/build.sbt +++ b/build.sbt @@ -15,17 +15,11 @@ credentials += Credentials("Artifactory Realm", "sbt-publisher", "***REMOVED***") -val scalaVersionValue = "2.10.6" +val scalaVersionValue = "2.12.3" scalaVersion := scalaVersionValue -// The following don't work with scala 2.10 -scalacOptions := scalacOptions.value.filterNot(Seq( - "-Xlint:-missing-interpolator", - "-Ywarn-unused", - "-Ywarn-unused-import").contains) - -val slickVersionValue = "3.1.1" +val slickVersionValue = "3.2.1" libraryDependencies ++= Seq( "com.typesafe.slick" %% "slick" % slickVersionValue, diff --git a/project/build.properties b/project/build.properties index 5f32afe..b7dd3cb 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 \ No newline at end of file +sbt.version=1.0.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 68c4f56..76f85b6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3") +addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6") resolvers += "releases" at "https://drivergrp.jfrog.io/drivergrp/releases" -addSbtPlugin("xyz.driver" % "sbt-settings" % "0.5.47") +addSbtPlugin("xyz.driver" % "sbt-settings" % "1.0.1") diff --git a/src/main/scala/SchemaParser.scala b/src/main/scala/SchemaParser.scala index 6c3dd8c..395850e 100644 --- a/src/main/scala/SchemaParser.scala +++ b/src/main/scala/SchemaParser.scala @@ -3,8 +3,8 @@ import scala.concurrent.ExecutionContext.Implicits.global import slick.dbio.DBIO import slick.driver.JdbcProfile import slick.jdbc.meta.MTable -import slick.profile.RelationalProfile.ColumnOption.Length -import slick.profile.SqlProfile.ColumnOption.SqlType +import slick.relational.RelationalProfile.ColumnOption.Length +import slick.sql.SqlProfile.ColumnOption.SqlType import slick.{model => m} object ModelTransformation { -- cgit v1.2.3