zio · adamgfraser · Oct 22, 2021 · Sep 16, 2021 · Sep 16, 2021 · Sep 16, 2021
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
     timeout-minutes: 60
     steps:
     - name: Checkout current branch
-      uses: actions/[email protected].4
+      uses: actions/[email protected].5
     - name: Setup Scala and Java
       uses: olafurpg/setup-scala@v13
     - name: Cache scala dependencies
@@ -33,7 +33,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout current branch
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
       - name: Setup Scala and Java
         uses: olafurpg/setup-scala@v13
       - name: Cache scala dependencies
@@ -46,7 +46,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout current branch
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
       - name: Setup Scala and Java
         uses: olafurpg/setup-scala@v13
       - name: Cache scala dependencies
@@ -59,20 +59,14 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout current branch
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
       - name: Setup Scala and Java
         uses: olafurpg/setup-scala@v13
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Check Website Generation
         run: |
-          ./sbt docs/mdoc
-          cd website
-          mv version2-only-docusaurus.config.js docusaurus.config.js 
-          rm -f versions.json
-          yarn install 
-          yarn build 
-          cd ..
+          ./scripts/checkSite.sh
 
   test:
     runs-on: ubuntu-20.04
@@ -81,28 +75,28 @@ jobs:
       fail-fast: false
       matrix:
         java: ['8']
-        scala: ['2.11.12', '2.12.15', '2.13.6', '3.0.2']
+        scala: ['2.11.12', '2.12.15', '2.13.6', '3.1.0']
         platform: ['JVM']
     steps:
     - name: Checkout current branch
-      uses: actions/[email protected].4
+      uses: actions/[email protected].5
     - name: Setup Scala and Java
       uses: olafurpg/setup-scala@v13
       with:
         java-version: ${{ matrix.java }}
     - name: Cache scala dependencies
       uses: coursier/cache-action@v6
     - name: Mima Checks
-      if: ${{ !startsWith(matrix.scala, '3.0.') }}
+      if: ${{ !startsWith(matrix.scala, '3.') }}
       run: ./sbt ++${{ matrix.scala }}! mimaChecks
     - name: Test 2.11.x
       if: ${{ startsWith(matrix.scala, '2.11.') }}
       run: ./sbt ++${{ matrix.scala }}! test${{ matrix.platform }}211
     - name: Test 2.12.x and 2.13.x
-      if: ${{ !startsWith(matrix.scala, '2.11.') && !startsWith(matrix.scala, '3.0.') }}
+      if: ${{ !startsWith(matrix.scala, '2.11.') && !startsWith(matrix.scala, '3.') }}
       run: ./sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
     - name: Test 3.x
-      if: ${{ startsWith(matrix.scala, '3.0.') }}
+      if: ${{ startsWith(matrix.scala, '3.') }}
       run: ./sbt ++${{ matrix.scala }}! test${{ matrix.platform }}Dotty
 
   testJvms:
@@ -115,7 +109,7 @@ jobs:
         platform: ['JVM']
     steps:
       - name: Checkout current branch
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
       - name: Setup Scala and Java
         uses: olafurpg/setup-scala@v13
         with:
@@ -135,7 +129,7 @@ jobs:
         platform: ['JS', 'Native']
     steps:
       - name: Checkout current branch
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
       - name: Setup Scala and Java
         uses: olafurpg/setup-scala@v13
         with:
@@ -159,7 +153,7 @@ jobs:
     if: github.event_name != 'pull_request'
     steps:
       - name: Checkout current branch
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
         with:
           fetch-depth: 0
       - name: Setup Scala and Java

diff --git a/build.sbt b/build.sbt
@@ -141,7 +141,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(macroDefinitionSettings)
   .settings(
     scalacOptions ++= {
-      if (scalaVersion.value == ScalaDotty)
+      if (scalaVersion.value == Scala3)
         Seq.empty
       else
         Seq("-P:silencer:globalFilters=[zio.stacktracer.TracingImplicits.disableAutoTrace]")
@@ -225,7 +225,7 @@ lazy val streams = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(macroDefinitionSettings)
   .settings(
     scalacOptions ++= {
-      if (scalaVersion.value == ScalaDotty)
+      if (scalaVersion.value == Scala3)
         Seq.empty
       else
         Seq("-P:silencer:globalFilters=[zio.stacktracer.TracingImplicits.disableAutoTrace]")
@@ -280,7 +280,7 @@ lazy val test = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   )
   .settings(
     scalacOptions ++= {
-      if (scalaVersion.value == ScalaDotty)
+      if (scalaVersion.value == Scala3)
         Seq.empty
       else
         Seq("-P:silencer:globalFilters=[zio.stacktracer.TracingImplicits.disableAutoTrace]")
@@ -327,13 +327,13 @@ lazy val testMagnolia = crossProject(JVMPlatform, JSPlatform)
   .settings(
     crossScalaVersions --= Seq(Scala211),
     scalacOptions ++= {
-      if (scalaVersion.value == ScalaDotty)
+      if (scalaVersion.value == Scala3)
         Seq.empty
       else
         Seq("-language:experimental.macros")
     },
     libraryDependencies ++= {
-      if (scalaVersion.value == ScalaDotty)
+      if (scalaVersion.value == Scala3)
         Seq.empty
       else
         Seq(
@@ -631,6 +631,7 @@ lazy val docs = project.module
       "dev.zio"                       %% "zio-schema"                    % "0.1.1",
       "dev.zio"                       %% "zio-sqs"                       % "0.4.2",
       "dev.zio"                       %% "zio-opentracing"               % "0.8.2",
+      "io.laserdisc"                  %% "tamer-db"                      % "0.16.1",
       "io.jaegertracing"               % "jaeger-core"                   % "1.6.0",
       "io.jaegertracing"               % "jaeger-client"                 % "1.6.0",
       "io.jaegertracing"               % "jaeger-zipkin"                 % "1.6.0",
@@ -657,10 +658,10 @@ lazy val docs = project.module
       "io.github.gaelrenoux"          %% "tranzactio"                    % "2.1.0",
       "io.github.neurodyne"           %% "zio-arrow"                     % "0.2.1",
       "nl.vroste"                     %% "zio-amqp"                      % "0.2.2",
-      "io.github.vigoo"               %% "zio-aws-core"                  % "3.17.56.1",
-      "io.github.vigoo"               %% "zio-aws-ec2"                   % "3.17.56.1",
-      "io.github.vigoo"               %% "zio-aws-elasticbeanstalk"      % "3.17.56.1",
-      "io.github.vigoo"               %% "zio-aws-netty"                 % "3.17.56.1",
+      "io.github.vigoo"               %% "zio-aws-core"                  % "3.17.58.1",
+      "io.github.vigoo"               %% "zio-aws-ec2"                   % "3.17.58.1",
+      "io.github.vigoo"               %% "zio-aws-elasticbeanstalk"      % "3.17.58.1",
+      "io.github.vigoo"               %% "zio-aws-netty"                 % "3.17.58.1",
       "io.github.neurodyne"           %% "zio-aws-s3"                    % "0.4.13",
       "io.d11"                        %% "zhttp"                         % "1.0.0.0-RC17",
       "com.coralogix"                 %% "zio-k8s-client"                % "1.3.4",
@@ -671,7 +672,8 @@ lazy val docs = project.module
       "com.typesafe.slick"            %% "slick-hikaricp"                % "3.3.3",
       "info.senia"                    %% "zio-test-akka-http"            % "1.0.3",
       "io.getquill"                   %% "quill-jdbc-zio"                % "3.10.0"
-    )
+    ),
+    resolvers += "Confluent" at "https://packages.confluent.io/maven"
   )
   .settings(macroDefinitionSettings)
   .settings(mdocJS := Some(jsdocs))

diff --git a/...in/scala-2.x/zio/ZIOVersionSpecific.scala → ...main/scala-2/zio/ZIOVersionSpecific.scala b/...in/scala-2.x/zio/ZIOVersionSpecific.scala → ...main/scala-2/zio/ZIOVersionSpecific.scala
diff --git a/.../zio/ZLayerCompanionVersionSpecific.scala → .../zio/ZLayerCompanionVersionSpecific.scala b/.../zio/ZLayerCompanionVersionSpecific.scala → .../zio/ZLayerCompanionVersionSpecific.scala
diff --git a/...ala-2.x/zio/ZManagedVersionSpecific.scala → ...scala-2/zio/ZManagedVersionSpecific.scala b/...ala-2.x/zio/ZManagedVersionSpecific.scala → ...scala-2/zio/ZManagedVersionSpecific.scala
diff --git a/...io/internal/macros/CleanCodePrinter.scala → ...io/internal/macros/CleanCodePrinter.scala b/...io/internal/macros/CleanCodePrinter.scala → ...io/internal/macros/CleanCodePrinter.scala
diff --git a/...zio/internal/macros/LayerMacroUtils.scala → ...zio/internal/macros/LayerMacroUtils.scala b/...zio/internal/macros/LayerMacroUtils.scala → ...zio/internal/macros/LayerMacroUtils.scala
diff --git a/...2.x/zio/internal/macros/LayerMacros.scala → ...a-2/zio/internal/macros/LayerMacros.scala b/...2.x/zio/internal/macros/LayerMacros.scala → ...a-2/zio/internal/macros/LayerMacros.scala
diff --git a/...-2.x/zio/internal/macros/WireMacros.scala → ...la-2/zio/internal/macros/WireMacros.scala b/...-2.x/zio/internal/macros/WireMacros.scala → ...la-2/zio/internal/macros/WireMacros.scala
diff --git a/...shared/src/main/scala-dotty/zio/=!=.scala → core/shared/src/main/scala-3/zio/=!=.scala b/...shared/src/main/scala-dotty/zio/=!=.scala → core/shared/src/main/scala-3/zio/=!=.scala
diff --git a/...ed/src/main/scala-dotty/zio/CanFail.scala → ...shared/src/main/scala-3/zio/CanFail.scala b/...ed/src/main/scala-dotty/zio/CanFail.scala → ...shared/src/main/scala-3/zio/CanFail.scala
diff --git a/...la-dotty/zio/IntersectionTypeCompat.scala → .../scala-3/zio/IntersectionTypeCompat.scala b/...la-dotty/zio/IntersectionTypeCompat.scala → .../scala-3/zio/IntersectionTypeCompat.scala
diff --git a/...d/src/main/scala-dotty/zio/NeedsEnv.scala → ...hared/src/main/scala-3/zio/NeedsEnv.scala b/...d/src/main/scala-dotty/zio/NeedsEnv.scala → ...hared/src/main/scala-3/zio/NeedsEnv.scala
diff --git a/.../scala-dotty/zio/ZIOVersionSpecific.scala → ...main/scala-3/zio/ZIOVersionSpecific.scala b/.../scala-dotty/zio/ZIOVersionSpecific.scala → ...main/scala-3/zio/ZIOVersionSpecific.scala
diff --git a/.../zio/ZLayerCompanionVersionSpecific.scala → .../zio/ZLayerCompanionVersionSpecific.scala b/.../zio/ZLayerCompanionVersionSpecific.scala → .../zio/ZLayerCompanionVersionSpecific.scala
diff --git a/...a-dotty/zio/ZManagedVersionSpecific.scala → ...scala-3/zio/ZManagedVersionSpecific.scala b/...a-dotty/zio/ZManagedVersionSpecific.scala → ...scala-3/zio/ZManagedVersionSpecific.scala
diff --git a/...zio/internal/macros/LayerMacroUtils.scala → ...zio/internal/macros/LayerMacroUtils.scala b/...zio/internal/macros/LayerMacroUtils.scala → ...zio/internal/macros/LayerMacroUtils.scala
diff --git a/...tty/zio/internal/macros/LayerMacros.scala → ...a-3/zio/internal/macros/LayerMacros.scala b/...tty/zio/internal/macros/LayerMacros.scala → ...a-3/zio/internal/macros/LayerMacros.scala
diff --git a/core/shared/src/main/scala/zio/ZIOAppDefault.scala b/core/shared/src/main/scala/zio/ZIOAppDefault.scala
@@ -22,7 +22,7 @@ import zio.stacktracer.TracingImplicits.disableAutoTrace
  * The entry point for a ZIO application.
  *
  * {{{
- * import zio.ZIOApp
+ * import zio.ZIOAppDefault
  * import zio.Console._
  *
  * object MyApp extends ZIOAppDefault {

diff --git a/docs/getting_started.md b/docs/getting_started.md
@@ -7,15 +7,15 @@ Include ZIO in your project by adding the following to your `build.sbt` file:
 
 ```scala mdoc:passthrough
 println(s"""```""")
-println(s"""libraryDependencies += "dev.zio" %% "zio" % "${zio.BuildInfo.version.split('+').head}"""")
+println(s"""libraryDependencies += "dev.zio" %% "zio" % "${java.lang.System.getenv("ZIO_LATEST_2")}"""")
 println(s"""```""")
 ```
 
 If you want to use ZIO streams, you should also include the following dependency:
 
 ```scala mdoc:passthrough
 println(s"""```""")
-println(s"""libraryDependencies += "dev.zio" %% "zio-streams" % "${zio.BuildInfo.version.split('+').head}"""")
+println(s"""libraryDependencies += "dev.zio" %% "zio-streams" % "${java.lang.System.getenv("ZIO_LATEST_2")}"""")
 println(s"""```""")
 ```
 

diff --git a/docs/howto/migrate/migration-guide.md b/docs/howto/migrate/migration-guide.md
@@ -267,7 +267,7 @@ object MyApp extends zio.App {
 Now in ZIO 2.x, the `zio.App` trait is deprecated and, we have the `zio.ZIOAppDefault` trait which is simpler than the former approach (Note that the `ZApp` and `ManagedApp` are also deprecated, and we should use the `ZIOAppDefault` instead):
 
 ```scala mdoc:compile-only
-import zio.ZIOApp
+import zio.ZIOAppDefault
 import zio.Console._
 
 object MyApp extends ZIOAppDefault {

diff --git a/docs/resources/ecosystem/community/tamer.md b/docs/resources/ecosystem/community/tamer.md
@@ -0,0 +1,71 @@
+## Tamer
+
+ [Tamer](https://github.com/laserdisc-io/tamer) is a multi-functional Kafka connector for producing data based on [ZIO Kafka](https://github.com/zio/zio-kafka).
+
+ ### Introduction
+
+ Tamer is a completely customizable source connector that produces to Kafka. It ships with preconfigured modules for SQL, cloud storage and REST API, but you can provide your own functions and Tamer will take care of the rest.
+
+ ### Installation
+
+ Depending on the source you have at hand you can add the correct dependency in your `build.sbt`:
+
+ ```scala
+ libraryDependencies += "io.laserdisc" %% "tamer-db"                % "0.16.1"
+ libraryDependencies += "io.laserdisc" %% "tamer-oci-objectstorage" % "0.16.1"
+ libraryDependencies += "io.laserdisc" %% "tamer-rest"              % "0.16.1"
+ libraryDependencies += "io.laserdisc" %% "tamer-s3"                % "0.16.1"
+ ```
+
+ ### Example
+
+ Let's say you have a inventory DB that's compatible with [Doobie](https://github.com/tpolecat/doobie), you can get all of your items with just a few lines of code:
+
+ ```scala
+ import tamer._
+ import tamer.db._
+
+ import doobie.implicits.legacy.instant._
+ import doobie.syntax.string._
+ import zio._
+ import zio.duration._
+ import zio.json._
+
+ import java.time.Instant
+
+ case class Row(id: String, name: String, description: Option[String], modifiedAt: Instant)
+     extends tamer.db.Timestamped(modifiedAt)
+
+ object Row {
+   implicit val rowJsonCodec = DeriveJsonCodec.gen[Row]
+ }
+
+ object DatabaseSimple extends zio.App {
+   // Here we'll go with zio-json codec, you can use avro, circe and jsoniter
+   // out-of-the box or plug yours!
+   implicit val stateKeyJsonCodec = DeriveJsonCodec.gen[tamer.Tamer.StateKey]
+   implicit val windowJsonCodec = DeriveJsonCodec.gen[tamer.db.Window]
+
+   val program: RIO[ZEnv, Unit] = tamer.db.DbSetup
+     .tumbling(window =>
+       sql"""SELECT id, name, description, modified_at 
+            |FROM users 
+            |WHERE modified_at > ${window.from} AND modified_at <= ${window.to}""".stripMargin
+         .query[Row]
+     )(
+       recordKey = (_, v) => v.id,
+       from = Instant.parse("2020-01-01T00:00:00.00Z"),
+       tumblingStep = 5.days
+     )
+     .runWith(dbLayerFromEnvironment ++ tamer.kafkaConfigFromEnvironment)
+
+   override final def run(args: List[String]): URIO[ZEnv, ExitCode] =
+     program.exitCode
+
+   // If you have other codecs like circe in the classpath you have to disambiguate
+   implicit lazy val stateKeyCodec: Codec[Tamer.StateKey] = Codec.optionalZioJsonCodec
+   implicit lazy val windowCodec: Codec[tamer.db.Window] = Codec.optionalZioJsonCodec
+   implicit lazy val stringCodec: Codec[String] = Codec.optionalZioJsonCodec
+ }
+ ```
+ See full example [on the GitHub repo](https://github.com/laserdisc-io/tamer/blob/4e1a7646fb44041648d9aa3ba089decb81ebe487/example/src/main/scala/tamer/db/DatabaseSimple.scala)
diff --git a/...mples/macros/AccessibleMacroExample.scala → ...mples/macros/AccessibleMacroExample.scala b/...mples/macros/AccessibleMacroExample.scala → ...mples/macros/AccessibleMacroExample.scala
diff --git a/.../examples/test/MockableMacroExample.scala → .../examples/test/MockableMacroExample.scala b/.../examples/test/MockableMacroExample.scala → .../examples/test/MockableMacroExample.scala
diff --git a/...ala-2.x/zio/macros/AccessibleMMSpec.scala → ...scala-2/zio/macros/AccessibleMMSpec.scala b/...ala-2.x/zio/macros/AccessibleMMSpec.scala → ...scala-2/zio/macros/AccessibleMMSpec.scala
diff --git a/...cala-2.x/zio/macros/AccessibleMSpec.scala → .../scala-2/zio/macros/AccessibleMSpec.scala b/...cala-2.x/zio/macros/AccessibleMSpec.scala → .../scala-2/zio/macros/AccessibleMSpec.scala
diff --git a/...scala-2.x/zio/macros/AccessibleSpec.scala → ...t/scala-2/zio/macros/AccessibleSpec.scala b/...scala-2.x/zio/macros/AccessibleSpec.scala → ...t/scala-2/zio/macros/AccessibleSpec.scala
diff --git a/...a-2.x/zio/macros/AccessibleSpecFlat.scala → ...ala-2/zio/macros/AccessibleSpecFlat.scala b/...a-2.x/zio/macros/AccessibleSpecFlat.scala → ...ala-2/zio/macros/AccessibleSpecFlat.scala
diff --git a/...la-2.x/zio/macros/AccessibleMMMacro.scala → ...cala-2/zio/macros/AccessibleMMMacro.scala b/...la-2.x/zio/macros/AccessibleMMMacro.scala → ...cala-2/zio/macros/AccessibleMMMacro.scala
diff --git a/...ala-2.x/zio/macros/AccessibleMMacro.scala → ...scala-2/zio/macros/AccessibleMMacro.scala b/...ala-2.x/zio/macros/AccessibleMMacro.scala → ...scala-2/zio/macros/AccessibleMMacro.scala
diff --git a/...2.x/zio/macros/AccessibleMMacroBase.scala → ...a-2/zio/macros/AccessibleMMacroBase.scala b/...2.x/zio/macros/AccessibleMMacroBase.scala → ...a-2/zio/macros/AccessibleMMacroBase.scala
diff --git a/...cala-2.x/zio/macros/AccessibleMacro.scala → .../scala-2/zio/macros/AccessibleMacro.scala b/...cala-2.x/zio/macros/AccessibleMacro.scala → .../scala-2/zio/macros/AccessibleMacro.scala
diff --git a/...-2.x/zio/macros/AccessibleMacroBase.scala → ...la-2/zio/macros/AccessibleMacroBase.scala b/...-2.x/zio/macros/AccessibleMacroBase.scala → ...la-2/zio/macros/AccessibleMacroBase.scala
diff --git a/...ain/scala-2.x/zio/macros/accessible.scala → .../main/scala-2/zio/macros/accessible.scala b/...ain/scala-2.x/zio/macros/accessible.scala → .../main/scala-2/zio/macros/accessible.scala
diff --git a/...in/scala-2.x/zio/macros/accessibleM.scala → ...main/scala-2/zio/macros/accessibleM.scala b/...in/scala-2.x/zio/macros/accessibleM.scala → ...main/scala-2/zio/macros/accessibleM.scala
diff --git a/...n/scala-2.x/zio/macros/accessibleMM.scala → ...ain/scala-2/zio/macros/accessibleMM.scala b/...n/scala-2.x/zio/macros/accessibleMM.scala → ...ain/scala-2/zio/macros/accessibleMM.scala
diff --git a/.../main/scala-2.x/zio/macros/throwing.scala → ...rc/main/scala-2/zio/macros/throwing.scala b/.../main/scala-2.x/zio/macros/throwing.scala → ...rc/main/scala-2/zio/macros/throwing.scala
diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -15,12 +15,14 @@ object BuildHelper {
       .loadFromReader(scala.io.Source.fromFile(".github/workflows/ci.yml").bufferedReader())
     val yaml = doc.asInstanceOf[JMap[String, JMap[String, JMap[String, JMap[String, JMap[String, JList[String]]]]]]]
     val list = yaml.get("jobs").get("test").get("strategy").get("matrix").get("scala").asScala
-    list.map(v => (v.split('.').take(2).mkString("."), v)).toMap
+    list.map { v =>
+      val vs = v.split('.'); val init = vs.take(vs(0) match { case "2" => 2; case _ => 1 }); (init.mkString("."), v)
+    }.toMap
   }
-  val Scala211: String   = versions("2.11")
-  val Scala212: String   = versions("2.12")
-  val Scala213: String   = versions("2.13")
-  val ScalaDotty: String = versions("3.0")
+  val Scala211: String = versions("2.11")
+  val Scala212: String = versions("2.12")
+  val Scala213: String = versions("2.13")
+  val Scala3: String   = versions("3")
 
   val SilencerVersion = "1.7.6"
 
@@ -63,30 +65,30 @@ object BuildHelper {
     )
 
   val dottySettings = Seq(
-    crossScalaVersions += ScalaDotty,
+    crossScalaVersions += Scala3,
     scalacOptions ++= {
-      if (scalaVersion.value == ScalaDotty)
+      if (scalaVersion.value == Scala3)
         Seq("-noindent")
       else
         Seq()
     },
     scalacOptions --= {
-      if (scalaVersion.value == ScalaDotty)
+      if (scalaVersion.value == Scala3)
         Seq("-Xfatal-warnings")
       else
         Seq()
     },
     Compile / doc / sources := {
       val old = (Compile / doc / sources).value
-      if (scalaVersion.value == ScalaDotty) {
+      if (scalaVersion.value == Scala3) {
         Nil
       } else {
         old
       }
     },
     Test / parallelExecution := {
       val old = (Test / parallelExecution).value
-      if (scalaVersion.value == ScalaDotty) {
+      if (scalaVersion.value == Scala3) {
         false
       } else {
         old
@@ -190,13 +192,13 @@ object BuildHelper {
   def crossPlatformSources(scalaVer: String, platform: String, conf: String, baseDir: File) = {
     val versions = CrossVersion.partialVersion(scalaVer) match {
       case Some((2, 11)) =>
-        List("2.11", "2.11+", "2.11-2.12", "2.x")
+        List("2.11+", "2.11-2.12")
       case Some((2, 12)) =>
-        List("2.12", "2.11+", "2.12+", "2.11-2.12", "2.12-2.13", "2.x")
+        List("2.11+", "2.12+", "2.11-2.12", "2.12-2.13")
       case Some((2, 13)) =>
-        List("2.13", "2.11+", "2.12+", "2.13+", "2.12-2.13", "2.x")
-      case Some((3, 0)) =>
-        List("dotty", "2.11+", "2.12+", "2.13+", "3.x")
+        List("2.11+", "2.12+", "2.13+", "2.12-2.13")
+      case Some((3, _)) =>
+        List("2.11+", "2.12+", "2.13+")
       case _ =>
         List()
     }
@@ -228,7 +230,7 @@ object BuildHelper {
     ThisBuild / scalaVersion := Scala213,
     scalacOptions ++= stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value),
     libraryDependencies ++= {
-      if (scalaVersion.value == ScalaDotty)
+      if (scalaVersion.value == Scala3)
         Seq(
           "com.github.ghik" % s"silencer-lib_$Scala213" % SilencerVersion % Provided
         )
@@ -263,7 +265,7 @@ object BuildHelper {
   def macroDefinitionSettings = Seq(
     scalacOptions += "-language:experimental.macros",
     libraryDependencies ++= {
-      if (scalaVersion.value == ScalaDotty) Seq()
+      if (scalaVersion.value == Scala3) Seq()
       else
         Seq(
           "org.scala-lang" % "scala-reflect"  % scalaVersion.value % "provided",