Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump sbt-org-policies to 0.9.4 #223

Merged
merged 4 commits into from Oct 3, 2018
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -3,7 +3,6 @@ language: scala
dist: precise

scala:
- 2.10.7
- 2.11.12
- 2.12.6

Expand All @@ -15,8 +14,6 @@ env:

matrix:
exclude:
- scala: 2.10.7
env: G4SBUILD=docs
- scala: 2.11.12
env: G4SBUILD=docs
- env: SCALAENV=all
Expand 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
Expand Down
6 changes: 1 addition & 5 deletions project/ProjectPlugin.scala
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion 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")