Skip to content

Commit

Permalink
Merge branch 'master' into drop-old-scala
Browse files Browse the repository at this point in the history
* master:
  Update sbt-sonatype to 3.11.3
  Update sbt-mima-plugin to 1.1.4
  Update sbt to 1.10.1
  Update sbt to 1.10.0
  Update scala-library to 2.13.14
  • Loading branch information
thyandrecardoso committed Aug 23, 2024
2 parents f92ea70 + 8557c7b commit 3d37ace
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
scala-version: [2.12.19, 2.13.13, 3.1.1]
scala-version: [2.12.19, 2.13.14, 3.1.1]
steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import ReleaseTransformations._
name := "uap-scala"
organization := "org.uaparser"

scalaVersion := "2.13.13"
crossScalaVersions := Seq("2.12.19", "2.13.13", "3.1.1")
scalaVersion := "2.13.14"
crossScalaVersions := Seq("2.12.19", "2.13.14", "3.1.1")

scalacOptions ++= Seq(
"-Xfatal-warnings",
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.1
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.3")

0 comments on commit 3d37ace

Please sign in to comment.