diff --git a/build.sbt b/build.sbt index de28a2f..5f2b70d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / tlBaseVersion := "0.7" +ThisBuild / tlBaseVersion := "2.2" ThisBuild / organization := "io.chrisdavenport" ThisBuild / organizationName := "Christopher Davenport" ThisBuild / startYear := Some(2018) @@ -7,10 +7,10 @@ ThisBuild / developers := List( tlGitHubDev("christopherdavenport", "Christopher Davenport") ) ThisBuild / tlCiReleaseBranches := Seq("main") -ThisBuild / sonatypeCredentialHost := xerial.sbt.Sonatype.sonatypeLegacy +ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org" -ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.16", "3.3.5") -ThisBuild / scalaVersion := "3.3.5" +ThisBuild / crossScalaVersions := Seq("2.12.21", "2.13.18", "3.3.7") +ThisBuild / scalaVersion := "3.3.7" ThisBuild / testFrameworks += new TestFramework("munit.Framework") @@ -18,12 +18,13 @@ ThisBuild / versionScheme := Some("early-semver") ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")) -val catsV = "2.9.0" -val catsEffectV = "3.4.9" -val catsCollectionV = "0.9.6" +val catsV = "2.13.0" +val catsEffectV = "3.7.0" +val catsCollectionV = "0.9.10" -val munitV = "1.0.0-M7" -val munitCEV = "2.0.0-M3" +val munitV = "1.2.4" +val munitCEV = "2.2.0" +val munitScalacheckV = "1.2.0" lazy val mules = tlCrossRootProject .aggregate(core, caffeine, reload, noop, bench) @@ -95,7 +96,7 @@ lazy val testDeps = Seq( libraryDependencies ++= Seq( "org.typelevel" %%% "cats-effect-laws" % catsEffectV % Test, "org.scalameta" %%% "munit" % munitV % Test, - "org.scalameta" %%% "munit-scalacheck" % munitV % Test, + "org.scalameta" %%% "munit-scalacheck" % munitScalacheckV % Test, "org.typelevel" %%% "munit-cats-effect" % munitCEV % Test ) ) diff --git a/modules/core/src/main/scala/io/chrisdavenport/mules/DispatchOneCache.scala b/modules/core/src/main/scala/io/chrisdavenport/mules/DispatchOneCache.scala index ca9ff60..7a44b66 100644 --- a/modules/core/src/main/scala/io/chrisdavenport/mules/DispatchOneCache.scala +++ b/modules/core/src/main/scala/io/chrisdavenport/mules/DispatchOneCache.scala @@ -27,7 +27,7 @@ import cats.implicits._ import scala.collection.immutable.Map import cats.effect.std.MapRef -import cats.effect.std.MapRef.fromSeqRefs +import cats.data.NonEmptySeq import java.util.concurrent.ConcurrentHashMap import scala.collection.mutable @@ -426,7 +426,7 @@ private[mules] object PurgeableMapRef { shards.map { s => PurgeableMapRef( - fromSeqRefs(s), + MapRef.fromNonEmptySeqRefs(NonEmptySeq.fromSeqUnsafe(s)), purgeExpiredEntries(s) ) } diff --git a/project/build.properties b/project/build.properties index e33f4da..67c44cc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.10 \ No newline at end of file +sbt.version=1.12.8 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 2f449e2..b2f95ef 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,9 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4") -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.7") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.7") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.5") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.5") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.10") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") \ No newline at end of file