From 61c578fcd9ba04a056f5cc199d28ea89848f7070 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Tue, 9 May 2017 15:15:40 -0700 Subject: Upgrade scala to latest patch level --- .travis.yml | 2 +- README.md | 4 ++-- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78ea1b5..623e5c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: scala # - oraclejdk8 scala: - - 2.11.8 + - 2.11.11 cache: directories: diff --git a/README.md b/README.md index 4f138a5..e6b8a64 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Do `sbt reload` after adding a plugin and configure a project: Artifact organization is set to `xyz.driver`. ### Scala compiler settings -Scala version — 2.11.8, flags configured: +Scala version — 2.11.11, flags configured: - Common settings: `-unchecked -feature -encoding utf8`, - _Advanced Scala features_: `-language:higherKinds -language:implicitConversions -language:postfixOps`, @@ -153,4 +153,4 @@ Scala version — 2.11.8, flags configured: .dependsOn (usersModule, assaysModule, reportsModule) .aggregate (usersModule, assaysModule, reportsModule) -For more examples please refer to [Driver Template](https://github.com/drivergroup/***REMOVED***), [Core library](https://github.com/drivergroup/***REMOVED***) or [***REMOVED***](https://github.com/drivergroup/***REMOVED***) projects. \ No newline at end of file +For more examples please refer to [Driver Template](https://github.com/drivergroup/***REMOVED***), [Core library](https://github.com/drivergroup/***REMOVED***) or [***REMOVED***](https://github.com/drivergroup/***REMOVED***) projects. diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 539a5a4..5f052f1 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -373,7 +373,7 @@ object SbtSettings extends AutoPlugin { override def trigger: PluginTrigger = allRequirements override def projectSettings: Seq[Setting[_]] = Defaults.coreDefaultSettings ++ Seq( organization := "xyz.driver", - scalaVersion := "2.11.8", + scalaVersion := "2.11.11", scalacOptions := (scalacDefaultOptions ++ scalacLanguageFeatures ++ scalacLintingOptions), scalacOptions in (Compile, console) := (scalacDefaultOptions ++ scalacLanguageFeatures), scalacOptions in (Compile, consoleQuick) := (scalacDefaultOptions ++ scalacLanguageFeatures), -- cgit v1.2.3