Skip to content

Commit

Permalink
upgrade scala and library versions
Browse files Browse the repository at this point in the history
  • Loading branch information
gmethvin committed Sep 22, 2024
1 parent 3218d68 commit 86062e3
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 23 deletions.
24 changes: 9 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
java: [adopt@1.8, zulu@1.17]
scala: [2.12.10, 2.13.10, 3.2.2]
exclude:
- scala: 2.12.10
os: macos-latest
- scala: 2.12.10
os: windows-latest
- scala: 2.12.10
java: adopt@1.8
- scala: 2.13.10
os: macos-latest
- scala: 2.13.10
os: windows-latest
- scala: 2.13.10
java: adopt@1.8
java: [adopt@1.8, zulu@1.17, zulu@1.21]
scala: [3.3.3]
include:
- scala: 2.13.14
os: ubuntu-latest
java: adopt@1.21
- scala: 2.12.20
os: ubuntu-latest
java: adopt@1.21

runs-on: ${{ matrix.os }}
steps:
Expand Down
16 changes: 8 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ inThisBuild(
new URL("https://github.com/gmethvin")
)
),
scalaVersion := "3.2.2",
scalaVersion := "3.3.3",
scalafmtOnCompile := true
)
)
Expand All @@ -28,7 +28,7 @@ def commonSettings =
publishTo := sonatypePublishToBundle.value,
Test / fork := true,
compile / javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint"),
scalacOptions += "-target:jvm-1.8",
scalacOptions ++= Seq("-release", "8"),
libraryDependencies ++= Seq(
"com.github.sbt" % "junit-interface" % "0.13.2" % Test,
"ch.qos.logback" % "logback-classic" % "1.3.4" % Test
Expand All @@ -45,22 +45,22 @@ lazy val `directory-watcher` = (project in file("core"))
"net.java.dev.jna" % "jna" % "5.13.0",
"org.slf4j" % "slf4j-api" % "1.7.36",
"io.airlift" % "command" % "0.3" % Test,
"com.google.guava" % "guava" % "31.1-jre" % Test,
"org.codehaus.plexus" % "plexus-utils" % "3.5.0" % Test,
"commons-io" % "commons-io" % "2.11.0" % Test,
"org.awaitility" % "awaitility" % "4.2.0" % Test
"com.google.guava" % "guava" % "33.3.0-jre" % Test,
"org.codehaus.plexus" % "plexus-utils" % "3.5.1" % Test,
"commons-io" % "commons-io" % "2.17.0" % Test,
"org.awaitility" % "awaitility" % "4.2.2" % Test
)
)

// directory-watcher-better-files is a Scala library.
lazy val `directory-watcher-better-files` = (project in file("better-files"))
.settings(commonSettings)
.settings(
crossScalaVersions := Seq(scalaVersion.value, "2.13.10", "2.12.10"),
crossScalaVersions := Seq(scalaVersion.value, "2.13.14", "2.12.20"),
crossPaths := true,
libraryDependencies ++= Seq(
"com.github.pathikrit" %% "better-files" % "3.9.2",
"org.scalatest" %% "scalatest" % "3.2.15" % Test
"org.scalatest" %% "scalatest" % "3.2.19" % Test
)
)
.dependsOn(`directory-watcher`)
Expand Down

0 comments on commit 86062e3

Please sign in to comment.