Skip to content

Commit

Permalink
Upgrade scalameta and cross-build to 2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
olafurpg committed Dec 12, 2016
1 parent efdbe17 commit 772ff62
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 14 deletions.
7 changes: 6 additions & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ build:
environment:
- COURSIER_CACHE=/drone/cache/coursier
commands:
- ./bin/testAll.sh
- export SBT_OPTS="-Xmx24G -XX:MaxPermSize=4G -Xss4M"
- sbt ++$SCALA_VERSION clean test scripted
matrix:
SCALA_VERSION:
- 2.11.8
- 2.12.1
cache:
mount:
- /drone/cache
4 changes: 0 additions & 4 deletions bin/testAll.sh

This file was deleted.

6 changes: 5 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import sbt.ScriptedPlugin._
organization in ThisBuild := "ch.epfl.scala"
version in ThisBuild := scalafix.Versions.nightly

lazy val crossVersions = Seq("2.11.8", "2.12.1")

lazy val buildSettings = Seq(
assemblyJarName in assembly := "scalafix.jar",
// See core/src/main/scala/ch/epfl/scala/Versions.scala
Expand Down Expand Up @@ -95,8 +97,9 @@ lazy val root = project
.dependsOn(core)

lazy val core = project
.settings(allSettings)
.settings(
allSettings,
crossScalaVersions := crossVersions,
moduleName := "scalafix-core",
addCompilerPlugin(
"org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
Expand All @@ -114,6 +117,7 @@ lazy val `scalafix-nsc` = project
.settings(
allSettings,
scalaVersion := "2.11.8",
crossScalaVersions := crossVersions,
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
"org.scalameta" %% "scalameta" % Build.metaV % "provided",
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
object Build {
val metaV = "1.3.0"
val metaV = "1.4.0"
val testV = "3.0.0"
}
14 changes: 7 additions & 7 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.5")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")
addSbtPlugin("org.brianmckenna" % "sbt-wartremover" % "0.14")
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.8.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.5")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "1.2.1")
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.8.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")

// TODO(olafur) re-enable scoverage.
// scoverage is disabled because it messes up with scalafix-nsc
Expand Down

0 comments on commit 772ff62

Please sign in to comment.