diff --git a/.travis.yml b/.travis.yml index 5ce580097..45e6ae1a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: scala dist: precise scala: -- 2.10.7 - 2.11.12 - 2.12.6 @@ -15,8 +14,6 @@ env: matrix: exclude: - - scala: 2.10.7 - env: G4SBUILD=docs - scala: 2.11.12 env: G4SBUILD=docs - env: SCALAENV=all @@ -37,6 +34,9 @@ install: - gem install ruby_dep -v 1.3.1 - gem install jekyll -v 3.4.3 - gem install jekyll-redirect-from +- nvm install 6 +- nvm use 6 +- node --version before_script: - sudo chmod +x /usr/local/bin/sbt diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index 8c30dc7ac..084546e23 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -97,11 +97,7 @@ object ProjectPlugin extends AutoPlugin { startYear := Option(2016), resolvers += Resolver.sonatypeRepo("snapshots"), scalaVersion := scalac.`2.12`, - crossScalaVersions := "2.10.6" :: scalac.crossScalaVersions, - scalacOptions ++= (scalaBinaryVersion.value match { - case "2.10" => Seq("-Xdivergence211") - case _ => Nil - }), + crossScalaVersions := scalac.crossScalaVersions, scalacOptions ~= (_ filterNot Set("-Xlint").contains), orgGithubTokenSetting := "GITHUB4S_ACCESS_TOKEN", orgBadgeListSetting := List( diff --git a/project/plugins.sbt b/project/plugins.sbt index bb996604f..31da1415c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") -addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.9.1") +addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.9.4") diff --git a/version.sbt b/version.sbt index b79ed09a6..02a441442 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.18.9-SNAPSHOT" \ No newline at end of file +version in ThisBuild := "0.19.0"