Skip to content

Upgraded sbt, dependencies and Changed API #463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Anurag300705 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgraded sbt, dependencies and Changed API #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ThisBuild / tlBaseVersion := "0.7"
ThisBuild / tlBaseVersion := "2.2"
ThisBuild / organization := "io.chrisdavenport"
ThisBuild / organizationName := "Christopher Davenport"
ThisBuild / startYear := Some(2018)
Expand All @@ -7,23 +7,24 @@ 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")

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)
Expand Down Expand Up @@ -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
)
)
4 changes: 2 additions & 2 deletions modules/core/src/main/scala/io/chrisdavenport/mules/DispatchOneCache.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -426,7 +426,7 @@ private[mules] object PurgeableMapRef {

shards.map { s =>
PurgeableMapRef(
fromSeqRefs(s),
MapRef.fromNonEmptySeqRefs(NonEmptySeq.fromSeqUnsafe(s)),
purgeExpiredEntries(s)
)
}
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.10
sbt.version=1.12.8
12 changes: 7 additions & 5 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Loading