Skip to content

Commit

Permalink
Merge branch 'main' into scala-2.13.13
Browse files Browse the repository at this point in the history
  • Loading branch information
danicheg committed Mar 3, 2024
2 parents f010a46 + dadd863 commit 7a50f86
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ lazy val root = project
(integrations / watchSources).value
)

val bin212 = Seq("2.12.18", "2.12.17", "2.12.16", "2.12.15", "2.12.14", "2.12.13")
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")

Expand All @@ -37,7 +37,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.18" or "scala_2.13.13" that we need.
// not "scala_2.12.19" or "scala_2.13.13" that we need.
// That's why we have to work around here.
val base = (Compile / sourceDirectory).value
val versionDir = scalaVersion.value.replaceAll("-.*", "")
Expand Down
8 changes: 8 additions & 0 deletions plugin/src/main/scala-2.12.19/tools/SettingsOps.scala
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
}
2 changes: 1 addition & 1 deletion project/BuildPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ object BuildImplementation {
Keys.organization := "ch.epfl.scala",
Keys.resolvers += Resolver.jcenterRepo,
Keys.updateOptions := Keys.updateOptions.value.withCachedResolution(true),
Keys.scalaVersion := "2.12.18",
Keys.scalaVersion := "2.12.19",
sbt.nio.Keys.watchTriggeredMessage := Watch.clearScreenOnTrigger,
BuildKeys.enableStatistics := true,
BuildKeys.showScalaInstances := BuildDefaults.showScalaInstances.value
Expand Down

0 comments on commit 7a50f86

Please sign in to comment.