diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a17730c4..495b083a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,56 +15,42 @@ on:
     tags: [v*]
 
 env:
-  PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-  SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-  SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
-  SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-  PGP_SECRET: ${{ secrets.PGP_SECRET }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+
+concurrency:
+  group: ${{ github.workflow }} @ ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.18, 2.13.12, 3.3.1]
+        scala: [2.12, 2.13, 3]
         java: [temurin@8]
         project: [rootJS, rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -94,11 +80,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: mkdir -p target .js/target native/target test-kit/js/target js/target test-kit/native/target test-kit/jvm/target jvm/target .jvm/target .native/target project/target
+        run: mkdir -p native/target test-kit/js/target js/target test-kit/native/target test-kit/jvm/target jvm/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: tar cf targets.tar target .js/target native/target test-kit/js/target js/target test-kit/native/target test-kit/jvm/target jvm/target .jvm/target .native/target project/target
+        run: tar cf targets.tar native/target test-kit/js/target js/target test-kit/native/target test-kit/jvm/target jvm/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
@@ -118,138 +104,166 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
 
-      - name: Download target directories (2.12.18, rootJS)
+      - name: Download target directories (2.12, rootJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS
 
-      - name: Inflate target directories (2.12.18, rootJS)
+      - name: Inflate target directories (2.12, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.18, rootJVM)
+      - name: Download target directories (2.12, rootJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
 
-      - name: Inflate target directories (2.12.18, rootJVM)
+      - name: Inflate target directories (2.12, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.18, rootNative)
+      - name: Download target directories (2.12, rootNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative
 
-      - name: Inflate target directories (2.12.18, rootNative)
+      - name: Inflate target directories (2.12, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.12, rootJS)
+      - name: Download target directories (2.13, rootJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS
 
-      - name: Inflate target directories (2.13.12, rootJS)
+      - name: Inflate target directories (2.13, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.12, rootJVM)
+      - name: Download target directories (2.13, rootJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM
 
-      - name: Inflate target directories (2.13.12, rootJVM)
+      - name: Inflate target directories (2.13, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.12, rootNative)
+      - name: Download target directories (2.13, rootNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative
 
-      - name: Inflate target directories (2.13.12, rootNative)
+      - name: Inflate target directories (2.13, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.1, rootJS)
+      - name: Download target directories (3, rootJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS
 
-      - name: Inflate target directories (3.3.1, rootJS)
+      - name: Inflate target directories (3, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.1, rootJVM)
+      - name: Download target directories (3, rootJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
 
-      - name: Inflate target directories (3.3.1, rootJVM)
+      - name: Inflate target directories (3, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.1, rootNative)
+      - name: Download target directories (3, rootNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative
 
-      - name: Inflate target directories (3.3.1, rootNative)
+      - name: Inflate target directories (3, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
       - name: Import signing key
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
+        env:
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: echo $PGP_SECRET | base64 -di | gpg --import
 
       - name: Import signing key and strip passphrase
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != ''
+        env:
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: |
           echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg
           echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg
           (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1)
 
       - name: Publish
+        env:
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
         run: sbt tlCiRelease
+
+  dependency-submission:
+    name: Submit Dependencies
+    if: github.event_name != 'pull_request'
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        java: [temurin@8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
+
+      - name: Submit Dependencies
+        uses: scalacenter/sbt-dependency-submission@v2
+        with:
+          modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3
+          configs-ignore: test scala-tool scala-doc-tool test-internal
diff --git a/js/src/main/scala/com/comcast/ip4s/DnsPlatform.scala b/js/src/main/scala/com/comcast/ip4s/DnsPlatform.scala
index 3be53de3..6949196e 100644
--- a/js/src/main/scala/com/comcast/ip4s/DnsPlatform.scala
+++ b/js/src/main/scala/com/comcast/ip4s/DnsPlatform.scala
@@ -20,9 +20,11 @@ import cats.effect.kernel.Async
 import cats.syntax.all._
 
 import scala.scalajs.js
-import scala.scalajs.js.|
+import scala.scalajs.js._
 import scala.scalajs.js.annotation.JSImport
 
+import org.typelevel.scalaccompat.annotation._
+
 private[ip4s] trait DnsCompanionPlatform {
   def forAsync[F[_]](implicit F: Async[F]): Dns[F] = new UnsealedDns[F] {
     def resolve(hostname: Hostname): F[IpAddress] =
@@ -85,6 +87,7 @@ private[ip4s] trait DnsCompanionPlatform {
 
 @js.native
 @JSImport("dns", "promises")
+@nowarn212("cat=unused")
 private[ip4s] object dnsPromises extends js.Any {
 
   def lookup(hostname: String, options: LookupOptions): js.Promise[LookupResult | js.Array[LookupResult]] = js.native
diff --git a/js/src/main/scala/com/comcast/ip4s/IDNCompanionPlatform.scala b/js/src/main/scala/com/comcast/ip4s/IDNCompanionPlatform.scala
index 84eb068f..ece3c6de 100644
--- a/js/src/main/scala/com/comcast/ip4s/IDNCompanionPlatform.scala
+++ b/js/src/main/scala/com/comcast/ip4s/IDNCompanionPlatform.scala
@@ -19,6 +19,7 @@ package com.comcast.ip4s
 import scalajs._
 import scala.scalajs.js.annotation._
 import scala.util.Try
+import org.typelevel.scalaccompat.annotation._
 
 private[ip4s] trait IDNCompanionPlatform {
   private[ip4s] def toAscii(value: String): Option[String] =
@@ -30,6 +31,7 @@ private[ip4s] trait IDNCompanionPlatform {
 
 @js.native
 @JSImport("punycode", JSImport.Default)
+@nowarn212("cat=unused")
 private[ip4s] object Punycode extends js.Any {
   def toASCII(value: String): String = js.native
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 8dfef2c0..39314cb1 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.22")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.2")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.15")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
diff --git a/shared/src/main/scala-2/Literals.scala b/shared/src/main/scala-2/Literals.scala
index bb640690..711dfe5a 100644
--- a/shared/src/main/scala-2/Literals.scala
+++ b/shared/src/main/scala-2/Literals.scala
@@ -22,7 +22,7 @@ import org.typelevel.literally.Literally
 object Literals {
 
   object ip extends Literally[IpAddress] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[IpAddress]] = {
       import c.universe._
       IpAddress.fromString(s) match {
         case Some(_) => Right(c.Expr(q"_root_.com.comcast.ip4s.IpAddress.fromString($s).get"))
@@ -33,7 +33,7 @@ object Literals {
   }
 
   object ipv4 extends Literally[Ipv4Address] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[Ipv4Address]] = {
       import c.universe._
       Ipv4Address.fromString(s) match {
         case Some(_) => Right(c.Expr(q"_root_.com.comcast.ip4s.Ipv4Address.fromString($s).get"))
@@ -44,7 +44,7 @@ object Literals {
   }
 
   object ipv6 extends Literally[Ipv6Address] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[Ipv6Address]] = {
       import c.universe._
       Ipv6Address.fromString(s) match {
         case Some(_) => Right(c.Expr(q"_root_.com.comcast.ip4s.Ipv6Address.fromString($s).get"))
@@ -55,7 +55,7 @@ object Literals {
   }
 
   object mip extends Literally[Multicast[IpAddress]] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[Multicast[IpAddress]]] = {
       import c.universe._
       IpAddress.fromString(s).flatMap(_.asMulticast) match {
         case Some(_) => Right(c.Expr(q"_root_.com.comcast.ip4s.IpAddress.fromString($s).get.asMulticast.get"))
@@ -66,7 +66,7 @@ object Literals {
   }
 
   object mipv4 extends Literally[Multicast[Ipv4Address]] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[Multicast[Ipv4Address]]] = {
       import c.universe._
       Ipv4Address.fromString(s).flatMap(_.asMulticast) match {
         case Some(_) => Right(c.Expr(q"_root_.com.comcast.ip4s.Ipv4Address.fromString($s).get.asMulticast.get"))
@@ -77,7 +77,7 @@ object Literals {
   }
 
   object mipv6 extends Literally[Multicast[Ipv6Address]] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[Multicast[Ipv6Address]]] = {
       import c.universe._
       Ipv6Address.fromString(s).flatMap(_.asMulticast) match {
         case Some(_) => Right(c.Expr(q"_root_.com.comcast.ip4s.Ipv6Address.fromString($s).get.asMulticast.get"))
@@ -88,7 +88,7 @@ object Literals {
   }
 
   object ssmip extends Literally[SourceSpecificMulticast.Strict[IpAddress]] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[SourceSpecificMulticast.Strict[IpAddress]]] = {
       import c.universe._
       IpAddress.fromString(s).flatMap(_.asSourceSpecificMulticast) match {
         case Some(_) =>
@@ -100,7 +100,7 @@ object Literals {
   }
 
   object ssmipv4 extends Literally[SourceSpecificMulticast.Strict[Ipv4Address]] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[SourceSpecificMulticast.Strict[Ipv4Address]]] = {
       import c.universe._
       Ipv4Address.fromString(s).flatMap(_.asSourceSpecificMulticast) match {
         case Some(_) =>
@@ -112,7 +112,7 @@ object Literals {
   }
 
   object ssmipv6 extends Literally[SourceSpecificMulticast.Strict[Ipv6Address]] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[SourceSpecificMulticast.Strict[Ipv6Address]]] = {
       import c.universe._
       Ipv6Address.fromString(s).flatMap(_.asSourceSpecificMulticast) match {
         case Some(_) =>
@@ -124,7 +124,7 @@ object Literals {
   }
 
   object port extends Literally[Port] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[Port]] = {
       import c.universe._
       scala.util.Try(s.toInt).toOption.flatMap(Port.fromInt) match {
         case Some(_) => Right(c.Expr(q"_root_.com.comcast.ip4s.Port.fromInt($s.toInt).get"))
@@ -135,7 +135,7 @@ object Literals {
   }
 
   object hostname extends Literally[Hostname] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[Hostname]] = {
       import c.universe._
       Hostname.fromString(s) match {
         case Some(_) => Right(c.Expr(q"_root_.com.comcast.ip4s.Hostname.fromString($s).get"))
@@ -146,7 +146,7 @@ object Literals {
   }
 
   object idn extends Literally[IDN] {
-    def validate(c: Context)(s: String) = {
+    def validate(c: Context)(s: String): Either[String, c.Expr[IDN]] = {
       import c.universe._
       IDN.fromString(s) match {
         case Some(_) => Right(c.Expr(q"_root_.com.comcast.ip4s.IDN.fromString($s).get"))
diff --git a/shared/src/main/scala/com/comcast/ip4s/MulticastSocketAddress.scala b/shared/src/main/scala/com/comcast/ip4s/MulticastSocketAddress.scala
index aecfaea2..59b4dda9 100644
--- a/shared/src/main/scala/com/comcast/ip4s/MulticastSocketAddress.scala
+++ b/shared/src/main/scala/com/comcast/ip4s/MulticastSocketAddress.scala
@@ -35,14 +35,14 @@ final case class MulticastSocketAddress[J[+x <: IpAddress] <: MulticastJoin[x],
 
   override def toString: String = {
     val (source, group) = join.sourceAndGroup
-    group.address match {
-      case _: Ipv4Address => s"$join:$port"
-      case _: Ipv6Address =>
+    group.address.fold(
+      _ => s"$join:$port",
+      _ =>
         source match {
           case None      => s"[${group.address}]:$port"
           case Some(src) => s"[$src]@[${group.address}]:$port"
         }
-    }
+    )
   }
 }