Skip to content

Commit e657d30

Browse files
committed
run scalafmt
1 parent 9d0b207 commit e657d30

File tree

1 file changed

+30
-31
lines changed

1 file changed

+30
-31
lines changed

build.sbt

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -87,29 +87,28 @@ lazy val compat = new MultiScalaCrossProject(
8787
)
8888
.disablePlugins(ScalafixPlugin),
8989
_.jsSettings(
90-
scalacOptions ++= {
91-
val x = (LocalRootProject / baseDirectory).value.toURI.toString
92-
val y = "https://raw.githubusercontent.com/scala/scala-collection-compat/" + sys.process
93-
.Process("git rev-parse HEAD")
94-
.lineStream_!
95-
.head
96-
val opt = CrossVersion.partialVersion(scalaVersion.value) match {
97-
case Some((3, _)) => "-scalajs-mapSourceURI"
98-
case _ => "-P:scalajs:mapSourceURI"
99-
}
100-
Seq(s"$opt:$x->$y/")
101-
},
102-
Test / fork := false // Scala.js cannot run forked tests
103-
)
104-
.jsEnablePlugins(ScalaJSJUnitPlugin),
90+
scalacOptions ++= {
91+
val x = (LocalRootProject / baseDirectory).value.toURI.toString
92+
val y = "https://raw.githubusercontent.com/scala/scala-collection-compat/" + sys.process
93+
.Process("git rev-parse HEAD")
94+
.lineStream_!
95+
.head
96+
val opt = CrossVersion.partialVersion(scalaVersion.value) match {
97+
case Some((3, _)) => "-scalajs-mapSourceURI"
98+
case _ => "-P:scalajs:mapSourceURI"
99+
}
100+
Seq(s"$opt:$x->$y/")
101+
},
102+
Test / fork := false // Scala.js cannot run forked tests
103+
).jsEnablePlugins(ScalaJSJUnitPlugin),
105104
_.nativeSettings(
106-
nativeLinkStubs := true,
107-
addCompilerPlugin(
108-
"org.scala-native" % "junit-plugin" % nativeVersion cross CrossVersion.full
109-
),
110-
libraryDependencies += "org.scala-native" %%% "junit-runtime" % nativeVersion,
111-
Test / fork := false // Scala Native cannot run forked tests
112-
)
105+
nativeLinkStubs := true,
106+
addCompilerPlugin(
107+
"org.scala-native" % "junit-plugin" % nativeVersion cross CrossVersion.full
108+
),
109+
libraryDependencies += "org.scala-native" %%% "junit-runtime" % nativeVersion,
110+
Test / fork := false // Scala Native cannot run forked tests
111+
)
113112
)
114113

115114
val compat211 = compat(Seq(JSPlatform, JVMPlatform, NativePlatform), scala211)
@@ -171,7 +170,7 @@ lazy val scalafixRules = project
171170
.settings(
172171
scalaModuleAutomaticModuleName := None,
173172
versionPolicyIntention := Compatibility.None,
174-
versionCheck := {}, // I don't understand why this fails otherwise?! oh well
173+
versionCheck := {}, // I don't understand why this fails otherwise?! oh well
175174
name := "scala-collection-migrations",
176175
scalaVersion := scalafixScala212,
177176
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion
@@ -289,14 +288,14 @@ lazy val scalafixTests = project
289288
.dependsOn(scalafixInput, scalafixRules)
290289
.enablePlugins(BuildInfoPlugin, ScalafixTestkitPlugin)
291290

292-
val ciScalaVersion = sys.env.get("CI_SCALA_VERSION").flatMap(Version.parse)
293-
val isScalaJs = sys.env.get("CI_PLATFORM") == Some("js")
294-
val isScalaNative = sys.env.get("CI_PLATFORM") == Some("native")
295-
val isScalafix = sys.env.get("CI_MODE") == Some("testScalafix")
296-
val isScalafmt = sys.env.get("CI_MODE") == Some("testScalafmt")
297-
val isBinaryCompat = sys.env.get("CI_MODE") == Some("testBinaryCompat")
298-
val isHeaderCheck = sys.env.get("CI_MODE") == Some("headerCheck")
299-
val jdkVersion = sys.env.get("CI_JDK").map(_.toInt)
291+
val ciScalaVersion = sys.env.get("CI_SCALA_VERSION").flatMap(Version.parse)
292+
val isScalaJs = sys.env.get("CI_PLATFORM") == Some("js")
293+
val isScalaNative = sys.env.get("CI_PLATFORM") == Some("native")
294+
val isScalafix = sys.env.get("CI_MODE") == Some("testScalafix")
295+
val isScalafmt = sys.env.get("CI_MODE") == Some("testScalafmt")
296+
val isBinaryCompat = sys.env.get("CI_MODE") == Some("testBinaryCompat")
297+
val isHeaderCheck = sys.env.get("CI_MODE") == Some("headerCheck")
298+
val jdkVersion = sys.env.get("CI_JDK").map(_.toInt)
300299

301300
// required by sbt-scala-module
302301
inThisBuild {

0 commit comments

Comments
 (0)