From 393cb411bdb7b23ce62b14de300fe788165a177f Mon Sep 17 00:00:00 2001 From: danicheg Date: Thu, 5 Sep 2024 08:51:27 +0300 Subject: [PATCH 1/5] Fix the directory of SettingsOps for Scala 2.12.19 --- .../{ => ch/epfl/scala/profilers}/tools/SettingsOps.scala | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugin/src/main/scala-2.12.19/{ => ch/epfl/scala/profilers}/tools/SettingsOps.scala (100%) diff --git a/plugin/src/main/scala-2.12.19/tools/SettingsOps.scala b/plugin/src/main/scala-2.12.19/ch/epfl/scala/profilers/tools/SettingsOps.scala similarity index 100% rename from plugin/src/main/scala-2.12.19/tools/SettingsOps.scala rename to plugin/src/main/scala-2.12.19/ch/epfl/scala/profilers/tools/SettingsOps.scala From a06585b425d5346290cba19d4709321bf7f629e0 Mon Sep 17 00:00:00 2001 From: danicheg Date: Thu, 5 Sep 2024 08:54:09 +0300 Subject: [PATCH 2/5] Add Scala 2.12.20 support --- build.sbt | 2 +- .../ch/epfl/scala/profilers/tools/SettingsOps.scala | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 plugin/src/main/scala-2.12.20/ch/epfl/scala/profilers/tools/SettingsOps.scala diff --git a/build.sbt b/build.sbt index 5a6490b..1ce27d9 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ 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/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 new file mode 100644 index 0000000..aadf96d --- /dev/null +++ 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 +} From 57d940b547bfa02e73dee0e7fd40d6635a6d3994 Mon Sep 17 00:00:00 2001 From: danicheg Date: Thu, 5 Sep 2024 08:54:47 +0300 Subject: [PATCH 3/5] Fix typo in the CI workflow --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f33d16..57ecf8d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,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: From 9a21c9a5c8d3e76197161dd374b91cf9e4ac7cb5 Mon Sep 17 00:00:00 2001 From: danicheg Date: Thu, 5 Sep 2024 08:55:08 +0300 Subject: [PATCH 4/5] Add Scala 2.12.20 to CI --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57ecf8d..3497c6c 100644 --- 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 From 63572fab81428ae37e17b5f9c735e11cfdfa8149 Mon Sep 17 00:00:00 2001 From: danicheg Date: Thu, 5 Sep 2024 08:58:19 +0300 Subject: [PATCH 5/5] Scalafmt --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1ce27d9..8cfc87b 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,8 @@ lazy val root = project (integrations / watchSources).value ) -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 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",