Merge pull request #138 from danicheg/2.12.20

Add Scala 2.12.20 support
scalacenter · Sep 7, 2024 · 7e3dc59 · 7e3dc59
2 parents bfc89a4 + 63572fa
commit 7e3dc59
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,6 +47,7 @@ jobs:
           - 2.12.17
           - 2.12.18
           - 2.12.19
+          - 2.12.20
           - 2.13.5
           - 2.13.6
           - 2.13.7
@@ -73,7 +74,7 @@ jobs:
         run: sbt -v '++ ${{ matrix.scala }}' plugin/test
       - name: SBT plugin tests
         run: sbt -v '++ ${{ matrix.scala }}' profilingSbtPlugin/scripted
-  intergration-tests:
+  integration-tests:
     name: Integration tests
     runs-on: ubuntu-latest
     steps:

diff --git a/build.sbt b/build.sbt
@@ -24,7 +24,8 @@ lazy val root = project
         (integrations / watchSources).value
   )
 
-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 bin212 =
+  Seq("2.12.20", "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.14",

diff --git a/...ain/scala-2.12.19/tools/SettingsOps.scala → ...l/scala/profilers/tools/SettingsOps.scala b/...ain/scala-2.12.19/tools/SettingsOps.scala → ...l/scala/profilers/tools/SettingsOps.scala
diff --git a/plugin/src/main/scala-2.12.20/ch/epfl/scala/profilers/tools/SettingsOps.scala b/plugin/src/main/scala-2.12.20/ch/epfl/scala/profilers/tools/SettingsOps.scala
@@ -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
+}