diff options
| author | Jakob Odersky <jakob@driver.xyz> | 2017-05-09 15:15:40 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@driver.xyz> | 2017-05-09 15:19:45 -0700 |
| commit | 61c578fcd9ba04a056f5cc199d28ea89848f7070 (patch) | |
| tree | 4bbc6d27bb7b2d2d3b8f2c14eda72b44e954ac8d | |
| parent | e6700999e9bd6af60bd49aea26f841893585ef8d (diff) | |
| download | sbt-settings-61c578fcd9ba04a056f5cc199d28ea89848f7070.tar.gz sbt-settings-61c578fcd9ba04a056f5cc199d28ea89848f7070.tar.bz2 sbt-settings-61c578fcd9ba04a056f5cc199d28ea89848f7070.zip | |
Upgrade scala to latest patch level
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | 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: @@ -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), |