Skip to content

Commit

Permalink
Merge branch 'master' into update/scalafmt-core-3.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ruippeixotog authored May 12, 2024
2 parents 8f97f87 + 9387d7a commit 45234b6
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
- scala: '2.12'
scala-version: 2.12.19
- scala: '2.13'
scala-version: 2.13.13
scala-version: 2.13.14
- scala: '3'
scala-version: 3.3.1
scala-version: 3.4.1

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

runner.dialect = scala3
align.preset = none
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ReleaseTransformations._
ThisBuild / organization := "net.ruippeixotog"

ThisBuild / scalaVersion := "2.12.19"
ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.13", "3.3.1")
ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.14", "3.4.1")

// taken from https://github.com/scala/bug/issues/12632
ThisBuild / libraryDependencySchemes ++= Seq(
Expand All @@ -18,12 +18,12 @@ lazy val core = project
name := "scala-scraper",
libraryDependencies ++= Seq(
"com.github.nscala-time" %% "nscala-time" % "2.32.0",
"org.htmlunit" % "htmlunit" % "3.11.0",
"org.htmlunit" % "htmlunit" % "4.1.0",
"org.jsoup" % "jsoup" % "1.17.2",
"org.scalaz" %% "scalaz-core" % "7.3.8",
"com.typesafe.akka" %% "akka-http" % "10.2.10" % "test" cross CrossVersion.for3Use2_13,
"com.typesafe.akka" %% "akka-stream" % "2.6.20" % "test" cross CrossVersion.for3Use2_13,
"org.slf4j" % "slf4j-nop" % "2.0.12" % "test",
"org.slf4j" % "slf4j-nop" % "2.0.13" % "test",
"org.specs2" %% "specs2-core" % "4.20.5" % "test"
),
mdocOut := file(".")
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.0
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.11")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")

0 comments on commit 45234b6

Please sign in to comment.