Skip to content

Commit

Permalink
Merge branch 'master' into generic-scala3-module
Browse files Browse the repository at this point in the history
  • Loading branch information
ruippeixotog committed Apr 25, 2024
2 parents 1e08574 + 1940203 commit 998e1e4
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -16,7 +16,7 @@ jobs:
- scala: '2.13'
scala-version: 2.13.13
- scala: '3'
scala-version: 3.3.0
scala-version: 3.3.3

steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
@@ -1,4 +1,4 @@
version = 3.8.0
version = 3.8.1

runner.dialect = scala213
align.preset = none
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Expand Up @@ -181,7 +181,7 @@ lazy val lintFlags = forScalaVersions {
// Use the same Scala 2.12 version in the root project as in subprojects
scalaVersion := scala212

// temp, will be done in: https://github.com/pureconfig/pureconfig/pull/1643
// Setting no cross build for the aggregating root project so that we can have proper per project exclusions.
crossScalaVersions := Nil

// do not publish the root project
Expand Down
4 changes: 2 additions & 2 deletions modules/fs2/build.sbt
Expand Up @@ -3,8 +3,8 @@ import Dependencies.Version._
crossScalaVersions := Seq(scala212, scala213, scala3)

libraryDependencies ++= Seq(
"co.fs2" %% "fs2-core" % "3.10.0",
"co.fs2" %% "fs2-io" % "3.10.0"
"co.fs2" %% "fs2-core" % "3.10.2",
"co.fs2" %% "fs2-io" % "3.10.2"
)

developers := List(Developer("keirlawson", "Keir Lawson", "keirlawson@gmail.com", url("https://github.com/keirlawson")))
2 changes: 1 addition & 1 deletion modules/magnolia/build.sbt
Expand Up @@ -3,7 +3,7 @@ import Dependencies.Version._
crossScalaVersions := Seq(scala212, scala213)

libraryDependencies ++= Seq(
"com.softwaremill.magnolia1_2" %% "magnolia" % "1.1.8",
"com.softwaremill.magnolia1_2" %% "magnolia" % "1.1.9",
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
// We're using shapeless for illTyped in tests.
"com.chuusai" %% "shapeless" % "2.3.10" % Test
Expand Down
2 changes: 1 addition & 1 deletion modules/scala-xml/build.sbt
Expand Up @@ -5,7 +5,7 @@ crossScalaVersions := Seq(scala212, scala213)

// Scala 2.12 depends on an old version of scala-xml
libraryDependencies ++= forScalaVersions {
case (2, 12) => Seq("org.scala-lang.modules" %% "scala-xml" % "2.2.0")
case (2, 12) => Seq("org.scala-lang.modules" %% "scala-xml" % "2.3.0")
case _ => Seq("org.scala-lang.modules" %% "scala-xml" % "2.0.1")
}.value

Expand Down
2 changes: 1 addition & 1 deletion modules/sttp/build.sbt
Expand Up @@ -3,7 +3,7 @@ import Dependencies.Version._
crossScalaVersions := Seq(scala212, scala213, scala3)

libraryDependencies ++= Seq(
"com.softwaremill.sttp.model" %% "core" % "1.7.9"
"com.softwaremill.sttp.model" %% "core" % "1.7.10"
)

developers := List(Developer("bszwej", "Bartlomiej Szwej", "bszwej@gmail.com", url("https://github.com/bszwej")))
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Expand Up @@ -10,7 +10,7 @@ object Dependencies {

val scalaTest = "3.2.18"
val scalaTestPlusScalaCheck = "3.2.18.0"
val scalaCheck = "1.17.0"
val scalaCheck = "1.18.0"
}

// testing libraries
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Expand Up @@ -9,7 +9,7 @@ addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.11")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")

libraryDependencies += "org.slf4j" % "slf4j-simple" % "2.0.12"
libraryDependencies += "org.slf4j" % "slf4j-simple" % "2.0.13"

// taken from https://github.com/scala/bug/issues/12632
ThisBuild / libraryDependencySchemes ++= Seq(
Expand Down

0 comments on commit 998e1e4

Please sign in to comment.