Skip to content

Commit

Permalink
Add scala-reflect back, fixes #492.
Browse files Browse the repository at this point in the history
Once scalameta/scalameta#502 is fixed, we can
remove scala-reflect.

Crazy enough, I wasn't able to reproduce the error via SBT so now I have
a bash script to ensure the same doesn't happen again.
  • Loading branch information
olafurpg committed Oct 6, 2016
1 parent e6f1832 commit 09e35de
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
2 changes: 2 additions & 0 deletions bin/issue492.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@


7 changes: 7 additions & 0 deletions bin/issue492.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# sbt cli/assembly
set -e
in_file=bin/issue492.scala
out_file=target/issue492-formatted.scala
java -jar cli/target/scala-2.11/scalafmt.jar -f $in_file > $out_file
diff $in_file $out_file

1 change: 1 addition & 0 deletions bin/testAll.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ set -e
sbt clean test
sbt "core/test:runMain org.scalafmt.FormatExperimentApp"
sbt "; publishLocal ; scripted"
./bin/issue492.sh
#sbt coverageAggregate

10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ lazy val buildSettings = Seq(

lazy val metaMacroSettings: Seq[Def.Setting[_]] = Seq(
libraryDependencies += "org.scalameta" %% "scalameta" % Deps.scalameta,
sources in (Compile,doc) := Nil,
sources in (Compile, doc) := Nil,
addCompilerPlugin(
"org.scalameta" % "paradise" % "3.0.0-M5" cross CrossVersion.full),
scalacOptions += "-Xplugin-require:macroparadise"
Expand Down Expand Up @@ -135,12 +135,12 @@ lazy val core = project
(runMain in Test).toTask(" org.scalafmt.FormatExperimentApp").value
},
libraryDependencies ++= Seq(
"com.lihaoyi" %% "sourcecode" % "0.1.2",
"org.scalameta" %% "scalameta" % Deps.scalameta,
"com.typesafe" % "config" % "1.2.1",
"com.lihaoyi" %% "sourcecode" % "0.1.2",
"org.scalameta" %% "scalameta" % Deps.scalameta,
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
"com.typesafe" % "config" % "1.2.1",
// Test dependencies
"org.scalariform" %% "scalariform" % Deps.scalariform,
"org.scala-lang" % "scala-reflect" % scalaVersion.value % "test",
"org.scala-lang" % "scala-compiler" % scalaVersion.value % "test",
"ch.qos.logback" % "logback-classic" % "1.1.6" % "test",
"com.googlecode.java-diff-utils" % "diffutils" % "1.3.0" % "test",
Expand Down

0 comments on commit 09e35de

Please sign in to comment.