Merge c4a2956 into f4ea160

.github/workflows/scala_2.12.yml

@@ -20,4 +20,4 @@ jobs:
       - name: Test
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: sbt -Dsbt.color=true -Dsbt.supershell=false ++2.12.9  clean test
+        run: sbt -Dsbt.color=true -Dsbt.supershell=false ++2.12.13  clean test

.github/workflows/scala_3.0.yml

@@ -20,4 +20,4 @@ jobs:
       - name: Test
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: sbt -Dsbt.color=true -Dsbt.supershell=false ++3.0.0-RC1 clean test
+        run: sbt -Dsbt.color=true -Dsbt.supershell=false ++3.0.0-RC2 clean test

build.sbt

@@ -16,31 +16,29 @@
 
 import ReleaseTransformations._
 
-lazy val scalaVersions = "2.13.3" :: "2.12.12" :: "2.11.12" :: "2.10.7" :: "3.0.0-RC1" :: Nil
+lazy val scalaVersions = "2.13.5" :: "2.12.13" :: "2.11.12" :: "2.10.7" :: "3.0.0-RC2" :: Nil
 
 lazy val guavaDependencies = Seq(
   "com.google.guava"         % "guava"  % "[15.0,24.0)",
   "com.google.code.findbugs" % "jsr305" % "[0.+,)" % "provided"
 )
 
-lazy val akkaDependencies = Def.setting {
-  Seq(
-    "com.typesafe.akka" %% "akka-actor"   % "[2.3.0,2.7.0)",
-    "com.typesafe.akka" %% "akka-testkit" % "[2.3.0,2.7.0)" % "test"
-  ).map(_.withDottyCompat(scalaVersion.value))
-}
+lazy val akkaDependencies = Seq(
+  "com.typesafe.akka" %% "akka-actor"   % "[2.3.0,2.7.0)" cross (CrossVersion.for3Use2_13),
+  "com.typesafe.akka" %% "akka-testkit" % "[2.3.0,2.7.0)" % "test" cross (CrossVersion.for3Use2_13)
+)
 
 lazy val nettyDependencies = Seq(
   "io.netty" % "netty-handler" % "[4.0.0,4.2.0)"
 )
 
 lazy val scalaTestDependencies = Def.setting(
   Seq(
-    "org.scalatest" %% "scalatest"         % "[3.2.2,3.2.6]" % "test",
-    "org.scalatest" %% "scalatest-funspec" % "[3.2.2,3.2.6]" % "test"
+    "org.scalatest" %% "scalatest"         % "[3.2.2,3.2.7]" % "test",
+    "org.scalatest" %% "scalatest-funspec" % "[3.2.2,3.2.7]" % "test"
   ) :+ (CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, 10)) => "org.scalatestplus" %% "scalacheck-1-14" % "[3.2.2.0,3.2.6.0]" % "test"
-    case _             => "org.scalatestplus" %% "scalacheck-1-15" % "[3.2.2.0,3.2.6.0]" % "test"
+    case Some((2, 10)) => "org.scalatestplus" %% "scalacheck-1-14" % "[3.2.2.0,3.2.7.0]" % "test"
+    case _             => "org.scalatestplus" %% "scalacheck-1-15" % "[3.2.2.0,3.2.7.0]" % "test"
   })
 )
 
@@ -51,15 +49,14 @@ def projectSettings(n: String, d: String) = Seq(
   scalaVersion := scalaVersions.head,
   scalacOptions ++= Seq("-feature", "-unchecked", "-deprecation") ++ (CrossVersion.partialVersion(scalaVersion.value) match {
     case Some((2, 10 | 11)) => Seq("-target:jvm-1.6")
-    case Some((3, 0))       => Seq("-Xtarget", "8")
+    case Some((3, 0))       => Seq("-Xtarget", "8", "-source:future-migration")
     case _                  => Seq("-target:jvm-1.8")
   }),
-  scalacOptions ++= { if (isDotty.value) Seq("-source:future-migration") else Nil },
   mimaPreviousArtifacts := Set(organization.value %% name.value % "0.10"),
   crossScalaVersions := scalaVersions,
   autoAPIMappings := true,
   publishMavenStyle := true,
-  publishArtifact in Test := false,
+  Test / publishArtifact := false,
   publishTo := sonatypePublishToBundle.value,
   sonatypeCredentialHost := "s01.oss.sonatype.org",
   sonatypeRepository := "https://s01.oss.sonatype.org/service/local",
@@ -93,7 +90,7 @@ lazy val dns4sProjectSettings = Seq(
 )
 
 lazy val dns4sAkkaProjectSettings = Seq(
-  libraryDependencies ++= guavaDependencies ++ akkaDependencies.value ++ scalaTestDependencies.value
+  libraryDependencies ++= guavaDependencies ++ akkaDependencies ++ scalaTestDependencies.value
 )
 
 lazy val dns4sNettyProjectSettings = Seq(
@@ -122,19 +119,19 @@ lazy val projectReleaseSettings = Seq(
 lazy val parentSettings = Seq(publishArtifact := false)
 
 lazy val siteSettings = ParadoxMaterialThemePlugin.paradoxMaterialThemeSettings(Paradox) ++ Seq(
-  scalacOptions in (Compile, doc) ++= Seq("-skip-packages", "akka.pattern", "-doc-title", name.value, "-doc-version", version.value),
+  Compile / doc / scalacOptions ++= Seq("-skip-packages", "akka.pattern", "-doc-title", name.value, "-doc-version", version.value),
   git.remoteRepo := "https://github.com/mkroli/dns4s.git",
-  siteSubdirName in ScalaUnidoc := "api",
-  addMappingsToSiteDir(mappings in (ScalaUnidoc, packageDoc), siteSubdirName in ScalaUnidoc),
+  ScalaUnidoc / siteSubdirName := "api",
+  addMappingsToSiteDir(ScalaUnidoc / packageDoc / mappings, ScalaUnidoc / siteSubdirName),
   mdocAutoDependency := (CrossVersion.partialVersion(scalaVersion.value) == Some((2, 13))),
   mdocIn := sourceDirectory.value / "main" / "doc",
-  sourceDirectory in Paradox := mdocOut.value,
-  sourceDirectory in Paradox in paradoxTheme := sourceDirectory.value / "main" / "paradox" / "template",
+  Paradox / sourceDirectory := mdocOut.value,
+  Paradox / paradoxTheme / sourceDirectory := sourceDirectory.value / "main" / "paradox" / "template",
   makeSite := makeSite.dependsOn(mdoc.toTask("")).value,
-  paradoxNavigationDepth := 5,
-  paradoxProperties in Paradox ~= (_ - "github.base_url"),
-  paradoxProperties in Paradox += ("version" -> version.value),
-  paradoxMaterialTheme in Paradox := {
+  Paradox / paradoxNavigationDepth.withRank(KeyRanks.Invisible) := 5,
+  Paradox / paradoxProperties ~= (_ - "github.base_url"),
+  Paradox / paradoxProperties += ("version" -> version.value),
+  Paradox / paradoxMaterialTheme := {
     ParadoxMaterialTheme()
       .withCopyright("© Michael Krolikowski")
       .withRepository(uri("https://github.com/mkroli/dns4s"))

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.5
+sbt.version=1.5.0-RC2

project/plugins.sbt

@@ -13,32 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
+addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.5")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
 
 addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.3")
 
 addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.6.0")
 
-addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.3")
+addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.19")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
 
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
 
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.7.0")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
 
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
-
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")