Skip to content

Commit

Permalink
Merge branch 'main' into fix-scalacenter#97
Browse files Browse the repository at this point in the history
  • Loading branch information
danicheg committed Jun 21, 2024
2 parents 699796a + 3bdfb1e commit 616b83b
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.0"
version = "3.8.2"
runner.dialect = Scala213
maxColumn = 100
docstrings.style = Asterisk
Expand Down
17 changes: 14 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,18 @@ lazy val root = project

val bin212 = Seq("2.12.19", "2.12.18", "2.12.17", "2.12.16", "2.12.15", "2.12.14", "2.12.13")
val bin213 =
Seq("2.13.13", "2.13.12", "2.13.11", "2.13.10", "2.13.9", "2.13.8", "2.13.7", "2.13.6", "2.13.5")
Seq(
"2.13.14",
"2.13.13",
"2.13.12",
"2.13.11",
"2.13.10",
"2.13.9",
"2.13.8",
"2.13.7",
"2.13.6",
"2.13.5"
)

// Copied from
// https://github.com/scalameta/scalameta/blob/370e304b0d10db1dd65fc79a5abc1f39004aeffd/build.sbt#L724-L737
Expand All @@ -37,7 +48,7 @@ lazy val fullCrossVersionSettings = Seq(
// NOTE: SBT 1.x provides cross-version support for Scala sources
// (https://www.scala-sbt.org/1.x/docs/Cross-Build.html#Scala-version+specific+source+directory).
// Unfortunately, it only includes directories like "scala_2.12" or "scala_2.13",
// not "scala_2.12.19" or "scala_2.13.13" that we need.
// not "scala_2.12.19" or "scala_2.13.14" that we need.
// That's why we have to work around here.
val base = (Compile / sourceDirectory).value
val versionDir = scalaVersion.value.replaceAll("-.*", "")
Expand Down Expand Up @@ -78,7 +89,7 @@ lazy val plugin = project
fullCrossVersionSettings,
name := "scalac-profiling",
libraryDependencies ++= List(
"com.lihaoyi" %% "pprint" % "0.8.1",
"com.lihaoyi" %% "pprint" % "0.9.0",
scalaOrganization.value % "scala-compiler" % scalaVersion.value
),
libraryDependencies ++= List(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package ch.epfl.scala.profilers.tools

import scala.tools.nsc.Global

object SettingsOps {
def areStatisticsEnabled(g: Global): Boolean =
g.settings.areStatisticsEnabled
}
6 changes: 3 additions & 3 deletions project/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ lazy val root = project
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12"),
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2"),
addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0"),
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2"),
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0"),
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.3"),
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0"),
// // Let's add our sbt plugin to the sbt too ;)
// unmanagedSourceDirectories in Compile ++= {
// val pluginMainDir = baseDirectory.value.getParentFile / "sbt-plugin" / "src" / "main"
// List(pluginMainDir / "scala", pluginMainDir / s"scala-sbt-${Keys.sbtBinaryVersion.value}")
// },
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.15"
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.17"
)

0 comments on commit 616b83b

Please sign in to comment.