From 8c3b7217b8be5b6f4d50949af3b546c7a5eb6bac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= <self@2m.lt>
Date: Wed, 28 Aug 2024 15:21:45 +0300
Subject: [PATCH] Support Scala 3.5.0

---
 .github/workflows/ci.yml                      | 24 ++++++++++++++++++-
 build.sbt                                     |  3 ++-
 .../ghik/zerowaste/ZerowastePlugin.scala      |  2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8f4f928..d2c8386 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,8 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala:
+          - 3.5.0
+          - 3.4.3
           - 3.4.2
           - 3.4.1
           - 3.4.0
@@ -90,7 +92,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.4.2]
+        scala: [3.5.0]
         java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
@@ -118,6 +120,26 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
+      - name: Download target directories (3.5.0)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-3.5.0-${{ matrix.java }}
+
+      - name: Inflate target directories (3.5.0)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
+      - name: Download target directories (3.4.3)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-3.4.3-${{ matrix.java }}
+
+      - name: Inflate target directories (3.4.3)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Download target directories (3.4.2)
         uses: actions/download-artifact@v2
         with:
diff --git a/build.sbt b/build.sbt
index 965a1fa..6c0d478 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,7 +2,8 @@ inThisBuild(Seq(
   organization := "com.github.ghik",
   scalaVersion := crossScalaVersions.value.head,
   crossScalaVersions := Seq(
-    "3.4.2", "3.4.1", "3.4.0",
+    "3.5.0",
+    "3.4.3", "3.4.2", "3.4.1", "3.4.0",
     "3.3.3", "3.3.2", "3.3.1", "3.3.0",
     "3.2.2", "3.2.1",
     "2.13.10", "2.13.11", "2.13.12", "2.13.13", "2.13.14",
diff --git a/src/main/scala-3/com/github/ghik/zerowaste/ZerowastePlugin.scala b/src/main/scala-3/com/github/ghik/zerowaste/ZerowastePlugin.scala
index d434a7f..3795c7b 100644
--- a/src/main/scala-3/com/github/ghik/zerowaste/ZerowastePlugin.scala
+++ b/src/main/scala-3/com/github/ghik/zerowaste/ZerowastePlugin.scala
@@ -15,7 +15,7 @@ class ZerowastePlugin extends StandardPlugin {
   def name = "zerowaste"
   def description = "Scala compiler plugin that disallows discarding of non-Unit expressions"
 
-  def init(options: List[String]): List[PluginPhase] =
+  override def init(options: List[String]): List[PluginPhase] =
     new ZerowastePhase :: Nil
 }