Merge pull request #28 from little-inferno/update-scala

Update scala version and sbt.
Tinkoff · Jul 9, 2023 · 1c3312a · 1c3312a
2 parents d2b5328 + c0afea3
commit 1c3312a
Show file tree

Hide file tree

Showing 34 changed files with 36 additions and 143 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,15 +6,15 @@ jobs:
   build:
     strategy:
       matrix:
-        scala: [3.2.2]
+        scala: [3.3.0]
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 18
+          java-version: 20
           check-latest: true
 
       - name: Coursier cache

diff --git a/build.sbt b/build.sbt
@@ -27,12 +27,16 @@ addCommandAlias("fix", "scalafmtAll")
 
 val commonSettings = Seq(
   version := "0.2.1",
-  scalaVersion := "3.2.2",
+  scalaVersion := "3.3.0",
   scalacOptions ++= Seq(
     "-explain",
     "-deprecation",
     "-no-indent",
-    "-old-syntax"
+    "-old-syntax",
+    "-Wunused:all",
+    "-Werror",
+    "-language:implicitConversions",
+    "-feature"
   ),
   publishMavenStyle := true,
   publishTo := {

diff --git a/modules/core/src/main/scala/muffin/api/ApiClient.scala b/modules/core/src/main/scala/muffin/api/ApiClient.scala
@@ -2,7 +2,6 @@ package muffin.api
 
 import java.time.*
 
-import cats.Monad
 import cats.effect.Concurrent
 import cats.syntax.all.given
 import fs2.*

diff --git a/modules/core/src/main/scala/muffin/codec/CodecSupport.scala b/modules/core/src/main/scala/muffin/codec/CodecSupport.scala
@@ -1,15 +1,10 @@
 package muffin.codec
 
 import java.time.*
-import scala.collection.StringParsers
-import scala.deriving.Mirror
-import scala.reflect.ClassTag
 
 import cats.Show
-import cats.arrow.FunctionK
-import cats.syntax.all.{*, given}
+import cats.syntax.all.*
 
-import muffin.api.*
 import muffin.error.MuffinError
 import muffin.http.*
 import muffin.internal.*

diff --git a/modules/core/src/main/scala/muffin/error/MuffinError.scala b/modules/core/src/main/scala/muffin/error/MuffinError.scala
@@ -1,6 +1,6 @@
 package muffin.error
 
-sealed trait MuffinError(message: String) extends Throwable
+sealed abstract class MuffinError(message: String) extends Throwable(message)
 
 object MuffinError {
 

diff --git a/modules/core/src/main/scala/muffin/http/HttpClient.scala b/modules/core/src/main/scala/muffin/http/HttpClient.scala
@@ -1,12 +1,8 @@
 package muffin.http
 
-import java.io.File
-
 import cats.Show
 import cats.syntax.all.given
 
-import muffin.codec.*
-
 trait HttpClient[F[_], To[_], From[_]] {
 
   def request[In: To, Out: From](

diff --git a/modules/core/src/main/scala/muffin/internal/dsl/package.scala b/modules/core/src/main/scala/muffin/internal/dsl/package.scala
@@ -3,7 +3,6 @@ package muffin.internal.dsl
 import cats.MonadThrow
 import cats.syntax.all.given
 
-import muffin.api.*
 import muffin.codec.Encode
 import muffin.internal.macros.RouterMacro
 import muffin.internal.router.*

diff --git a/modules/core/src/main/scala/muffin/internal/macros/RouterMacro.scala b/modules/core/src/main/scala/muffin/internal/macros/RouterMacro.scala
@@ -1,5 +1,6 @@
 package muffin.internal.macros
 
+import scala.annotation.nowarn
 import scala.quoted.*
 
 import cats.MonadThrow
@@ -9,6 +10,7 @@ import muffin.internal.router.*
 import muffin.model.*
 import muffin.router.*
 
+@nowarn
 class RouterMacro[F[_]: Type, G[_]: Type, T: Type](
     tree: Expr[T],
     monadThrowF: Expr[MonadThrow[F]],

diff --git a/modules/core/src/main/scala/muffin/internal/router/RouterDSL.scala b/modules/core/src/main/scala/muffin/internal/router/RouterDSL.scala
@@ -3,7 +3,6 @@ package muffin.internal.router
 import scala.quoted.*
 
 import muffin.model.{CommandAction, *}
-import muffin.router.HttpAction
 
 sealed trait RouterDSL
 

diff --git a/modules/core/src/main/scala/muffin/model/Channels.scala b/modules/core/src/main/scala/muffin/model/Channels.scala
@@ -2,10 +2,6 @@ package muffin.model
 
 import java.time.LocalDateTime
 
-import fs2.Stream
-
-import muffin.api.*
-
 enum NotifyOption {
   case All
   case Mention

diff --git a/modules/core/src/main/scala/muffin/model/Emoji.scala b/modules/core/src/main/scala/muffin/model/Emoji.scala
@@ -1,12 +1,9 @@
 package muffin.model
 
-import java.io.File
 import java.time.LocalDateTime
 
 import cats.Show
-import fs2.Stream
 
-import muffin.api.*
 import muffin.internal.NewType
 
 type EmojiId = EmojiId.Type

diff --git a/modules/core/src/main/scala/muffin/model/Groups.scala b/modules/core/src/main/scala/muffin/model/Groups.scala
@@ -1,9 +1,5 @@
 package muffin.model
 
-import fs2.Stream
-
-import muffin.api.*
-
 case class Group(
     id: GroupId,
     name: String,

diff --git a/modules/core/src/main/scala/muffin/model/Insights.scala b/modules/core/src/main/scala/muffin/model/Insights.scala
@@ -1,9 +1,6 @@
 package muffin.model
 
 import cats.Show
-import fs2.Stream
-
-import muffin.api.*
 
 case class ReactionInsight(emojiName: String, count: Long)
 

diff --git a/modules/core/src/main/scala/muffin/model/Posts.scala b/modules/core/src/main/scala/muffin/model/Posts.scala
@@ -3,10 +3,8 @@ package muffin.model
 import scala.collection.immutable.List
 
 import cats.syntax.all.given
-import fs2.Stream
 
 import muffin.*
-import muffin.api.*
 import muffin.codec.*
 
 case class Post(

diff --git a/modules/core/src/main/scala/muffin/model/Reactions.scala b/modules/core/src/main/scala/muffin/model/Reactions.scala
@@ -2,6 +2,4 @@ package muffin.model
 
 import java.time.LocalDateTime
 
-import muffin.api.*
-
 case class ReactionInfo(userId: UserId, postId: MessageId, emojiName: String, createAt: LocalDateTime)
diff --git a/modules/core/src/main/scala/muffin/model/Roles.scala b/modules/core/src/main/scala/muffin/model/Roles.scala
@@ -1,7 +1,5 @@
 package muffin.model
 
-import muffin.api.*
-
 case class RoleInfo(
     id: String,
     name: String,

diff --git a/modules/core/src/main/scala/muffin/model/Status.scala b/modules/core/src/main/scala/muffin/model/Status.scala
@@ -4,8 +4,6 @@ import java.time.LocalDateTime
 
 import cats.syntax.all.given
 
-import muffin.api.*
-
 case class UserStatus(
     userId: UserId,
     status: StatusUser,

diff --git a/modules/core/src/main/scala/muffin/model/Teams.scala b/modules/core/src/main/scala/muffin/model/Teams.scala
@@ -2,10 +2,6 @@ package muffin.model
 
 import java.time.LocalDateTime
 
-import fs2.Stream
-
-import muffin.api.*
-
 case class Team(
     id: TeamId,
     createAt: LocalDateTime,

diff --git a/modules/core/src/main/scala/muffin/model/Users.scala b/modules/core/src/main/scala/muffin/model/Users.scala
@@ -1,9 +1,5 @@
 package muffin.model
 
-import fs2.Stream
-
-import muffin.api.*
-
 case class User(
     id: UserId,
     username: String,

diff --git a/modules/core/src/main/scala/muffin/model/package.scala b/modules/core/src/main/scala/muffin/model/package.scala
@@ -1,7 +1,5 @@
 package muffin.model
 
-import cats.Show
-
 import muffin.internal.NewType
 
 type Login = Login.Type

diff --git a/modules/core/src/test/scala/muffin/api/ApiTest.scala b/modules/core/src/test/scala/muffin/api/ApiTest.scala
@@ -1,11 +1,9 @@
 package muffin.api
 
-import java.io.InputStream
-import java.nio.charset.StandardCharsets
 import java.time.ZoneId
 
-import cats.effect.{IO, Resource}
-import cats.syntax.all.{*, given}
+import cats.effect.IO
+import cats.syntax.all.*
 
 import org.scalatest.{Assertion, Succeeded, Tag}
 import org.scalatest.featurespec.AsyncFeatureSpec

diff --git a/modules/core/src/test/scala/muffin/api/ApiTestSupport.scala b/modules/core/src/test/scala/muffin/api/ApiTestSupport.scala
@@ -5,7 +5,7 @@ import java.nio.charset.StandardCharsets
 import scala.concurrent.Future
 
 import cats.effect.{IO, Resource}
-import cats.syntax.all.{*, given}
+import cats.syntax.all.*
 
 import io.circe.{parser, Decoder, HCursor, Json}
 import org.scalactic.source.Position

diff --git a/modules/core/src/test/scala/muffin/api/DslTest.scala b/modules/core/src/test/scala/muffin/api/DslTest.scala
@@ -4,14 +4,13 @@ import cats.syntax.all.given
 
 import org.scalatest.Tag
 
-import muffin.api.ApiTestSupport
 import muffin.codec.{CodecSupport, Decode, Encode}
 import muffin.dsl.*
 import muffin.model.*
 
 trait DslTest[To[_], From[_]](integration: String, codecSupport: CodecSupport[To, From]) extends ApiTestSupport {
 
-  import codecSupport.{*, given}
+  import codecSupport.*
 
   given Encoder: Encode[State]
   given Decoder: Decode[State]
@@ -74,7 +73,7 @@ trait DslTest[To[_], From[_]](integration: String, codecSupport: CodecSupport[To
       assert(dialogDsl.state[State].contains(state))
 
       val dialogRaw =
-        new Dialog(
+        Dialog(
           title = "Dialog",
           callbackId = "Callback".some,
           introductionText = "introduction".some,

diff --git a/modules/examples/http4s-sttp-circe/src/main/scala/muffin/Application.scala b/modules/examples/http4s-sttp-circe/src/main/scala/muffin/Application.scala
@@ -4,7 +4,6 @@ import java.time.{LocalDateTime, ZoneId}
 
 import cats.effect.*
 import cats.effect.IO.given
-import cats.effect.syntax.all.given
 
 import com.comcast.ip4s.*
 import io.circe.{Decoder, Encoder}
@@ -45,7 +44,7 @@ object Application extends IOApp {
 
       router <- timeHandle.in[IO, IO]()
 
-      routes = Http4sRoute.routes(router, codec)
+      routes = Http4sRoute.routes(router)
 
       _ <- EmberServerBuilder.default[IO].withHost(ipv4"0.0.0.0").withPort(port"8080")
         .withHttpApp(Router("/" -> routes).orNotFound).build.use(_ => IO.never)

diff --git a/modules/examples/zhttp-zjson/src/main/scala/muffin/Application.scala b/modules/examples/zhttp-zjson/src/main/scala/muffin/Application.scala
@@ -40,7 +40,7 @@ object Application extends ZIOAppDefault {
 
       router <- handle(handler, "kek").command(_.time).in[RHttp[Client], Task]()
 
-      routes = ZioRoutes.routes(router, codec)
+      routes = ZioRoutes.routes(router)
       _ <- Server.serve(routes)
     } yield _root_.zio.ExitCode.success)
       .provide(Server.default, Client.default)

diff --git a/modules/integration/circe-json-interop/src/main/scala/muffin/interop/json/circe/codec.scala b/modules/integration/circe-json-interop/src/main/scala/muffin/interop/json/circe/codec.scala
@@ -1,9 +1,7 @@
 package muffin.interop.json.circe
 
 import java.time.*
-import scala.deriving.Mirror
 
-import cats.{~>, catsParallelForId}
 import cats.arrow.FunctionK
 import cats.syntax.all.given
 
@@ -12,11 +10,9 @@ import io.circe.Decoder.Result
 import io.circe.parser.*
 import io.circe.syntax.given
 
-import muffin.api.*
 import muffin.codec.*
 import muffin.error.MuffinError
 import muffin.http.Body
-import muffin.router.*
 
 object codec extends CodecSupport[Encoder, Decoder] {
 

diff --git a/...ntegration/circe-json-interop/src/test/scala/muffin/interop/json/circe/CirceApiTest.scala b/...ntegration/circe-json-interop/src/test/scala/muffin/interop/json/circe/CirceApiTest.scala
@@ -1,23 +1,14 @@
 package muffin.interop.json.circe
 
-import java.io.InputStream
-import java.nio.charset.StandardCharsets
-import java.time.ZoneId
+import cats.effect.IO
+import cats.syntax.all.*
 
-import cats.effect.{IO, Resource}
-import cats.syntax.all.{*, given}
-
-import codec.{*, given}
 import io.circe.*
-import io.circe.syntax.{*, given}
 import org.scalatest.*
 import org.scalatest.featurespec.AsyncFeatureSpec
 
-import muffin.api.{ApiClient, ApiTest, ClientConfig}
-import muffin.codec.CodecSupport
-import muffin.dsl.*
+import muffin.api.ApiTest
 import muffin.http.{Body, HttpClient, Method, Params}
-import muffin.model.*
 
 class CirceApiTest extends ApiTest[Encoder, Decoder]("circe", codec) {