Upgrade to Scala 2.12.6 (#554)

* Upgrades the build, including Scala 2.12.6 and Sbt 1.1.6 * Releases freestyle 0.8.2 * Updates scala version in travis.yml file
frees-io · Jun 7, 2018 · 86f3b9a · 86f3b9a
1 parent ea36637
commit 86f3b9a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
 
 scala:
 - 2.11.12
-- 2.12.4
+- 2.12.6
 
 env:
 - SCALAENV=jvm

diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
@@ -82,7 +82,9 @@ object ProjectPlugin extends AutoPlugin {
     Seq(
       orgUpdateDocFilesSetting += baseDirectory.value / "docs" / "src",
       orgScriptTaskListSetting := List("validate".asRunnableItemFull),
-      coverageExcludedPackages := "<empty>;todo\\..*;freeslick\\..*"
+      coverageExcludedPackages := "<empty>;todo\\..*;freeslick\\..*",
+      scalaVersion := "2.12.6",
+      crossScalaVersions := Seq("2.11.12", "2.12.6")
     ) ++ scalaMetaSettings ++ sharedReleaseProcess
 
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.4
+sbt.version=1.1.6
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
 resolvers += Resolver.sonatypeRepo("releases")
 
-addSbtPlugin("io.frees"        % "sbt-freestyle"   % "0.3.21")
+addSbtPlugin("io.frees"        % "sbt-freestyle"   % "0.3.23")
 addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.2.1")
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.8.2-SNAPSHOT"
+version in ThisBuild := "0.8.2"
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ language: scala @@
     scala:
     - 2.11.12
-    - 2.12.4
+    - 2.12.6
     env:
     - SCALAENV=jvm
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "0.8.2-SNAPSHOT"
		version in ThisBuild := "0.8.2"