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.

Sign up for GitHub

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

Fix scalafmt error #549

Merged
merged 2 commits into from
Jan 4, 2021
Merged

Fix scalafmt error #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49df811
Fix scalafmt error
raboof Dec 17, 2020
5669545
Remove a corrupt scalactic_2.13-3.1.2.jar.
dwijnand Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ lazy val `play-json` = crossProject(JVMPlatform, JSPlatform)
.settings(
commonSettings ++ playJsonMimaSettings ++ Seq(
libraryDependencies ++= jsonDependencies(scalaVersion.value) ++ Seq(
"org.scalatest" %%% "scalatest" % "3.1.2" % Test,
"org.scalatest" %%% "scalatest" % "3.1.2" % Test, // 3.1.2 is the last version that uses Scala.js 1.0.x
"org.scalatestplus" %%% "scalacheck-1-14" % "3.1.2.0" % Test,
"org.scalacheck" %%% "scalacheck" % "1.14.3" % Test,
"com.chuusai" %% "shapeless" % "2.3.3" % Test,
Expand Down
4 changes: 2 additions & 2 deletions play-json/shared/src/test/scala/play/api/libs/json/MacroSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ class MacroSpec extends AnyWordSpec with Matchers with org.scalatestplus.scalach
val expected = Leaf2(1)
val expectedJs = Json.obj("_type" -> "play.api.libs.json.MacroSpec.Leaf2", "value" -> 1)

Json.toJson[TreeValue](expected) mustEqual expectedJs
expectedJs.validate[TreeValue] mustEqual JsSuccess(expected)
Json.toJson[TreeValue](expected).mustEqual(expectedJs)
expectedJs.validate[TreeValue].mustEqual(JsSuccess(expected))
}
}

Expand Down
2 changes: 2 additions & 0 deletions scripts/test-code.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

rm /home/travis/.cache/coursier/v1/https/repo1.maven.org/maven2/org/scalactic/scalactic_2.13/3.1.2/scalactic_2.13-3.1.2.jar || true

echo SCALA_VERSION=$SCALA_VERSION
sbt -DscalaJSStage=full ++$SCALA_VERSION test publishLocal || exit 1
sbt ++$SCALA_VERSION docs/test || exit 2