Skip to content

Commit 010ecbc

Browse files
committed
Merge branch 'main' into update/sbt-updates-0.7.0
2 parents 1d93445 + 7a1cee3 commit 010ecbc

4 files changed

Lines changed: 15 additions & 13 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: Test
2828
strategy:
2929
matrix:
30-
os: [ubuntu-22.04]
30+
os: [ubuntu-latest]
3131
scala: [2.13, 3]
3232
java: [temurin@17]
3333
project: [skunkJS, skunkJVM, skunkNative]
@@ -69,7 +69,7 @@ jobs:
6969
run: sbt githubWorkflowCheck
7070

7171
- name: Check headers
72-
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
72+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
7373
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll
7474

7575
- name: scalaJSLink
@@ -84,11 +84,11 @@ jobs:
8484
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
8585

8686
- name: Check binary compatibility
87-
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
87+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
8888
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
8989

9090
- name: Generate API documentation
91-
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
91+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
9292
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
9393

9494
- name: Make target directories
@@ -112,7 +112,7 @@ jobs:
112112
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.6.x')
113113
strategy:
114114
matrix:
115-
os: [ubuntu-22.04]
115+
os: [ubuntu-latest]
116116
java: [temurin@17]
117117
runs-on: ${{ matrix.os }}
118118
steps:

build.sbt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ThisBuild / tlBaseVersion := "1.1"
22

33
// Our Scala versions.
44
lazy val `scala-2.13` = "2.13.18"
5-
lazy val `scala-3.0` = "3.3.7"
5+
lazy val `scala-3.0` = "3.3.8"
66

77
ThisBuild / scalaVersion := `scala-2.13`
88
ThisBuild / crossScalaVersions := Seq(`scala-2.13`, `scala-3.0`)
@@ -16,6 +16,8 @@ ThisBuild / developers := List(
1616
ThisBuild / tlCiReleaseBranches += "series/0.6.x"
1717
ThisBuild / tlCiScalafmtCheck := false
1818
ThisBuild / tlSitePublishBranch := Some("series/0.6.x")
19+
20+
ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest")
1921
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"))
2022
ThisBuild / tlJdkRelease := Some(8)
2123
ThisBuild / resolvers += Resolver.sonatypeCentralSnapshots
@@ -73,9 +75,9 @@ ThisBuild / libraryDependencySchemes +=
7375
// This is used in a couple places
7476
lazy val fs2Version = "3.13.0"
7577
lazy val openTelemetryVersion = "1.63.0"
76-
lazy val otel4sVersion = "1.0.0"
78+
lazy val otel4sVersion = "1.0.1"
7779
lazy val otel4sSdkVersion = "0.19.0"
78-
lazy val refinedVersion = "0.11.3"
80+
lazy val refinedVersion = "0.11.4"
7981

8082
// Global Settings
8183
lazy val commonSettings = Seq(
@@ -168,8 +170,8 @@ lazy val circe = crossProject(JVMPlatform, JSPlatform, NativePlatform)
168170
.settings(
169171
name := "skunk-circe",
170172
libraryDependencies ++= Seq(
171-
"io.circe" %%% "circe-core" % "0.14.15",
172-
"io.circe" %%% "circe-jawn" % "0.14.15"
173+
"io.circe" %%% "circe-core" % "0.14.16",
174+
"io.circe" %%% "circe-jawn" % "0.14.16"
173175
)
174176
)
175177

@@ -263,7 +265,7 @@ lazy val bench = project
263265
.dependsOn(core.jvm)
264266
.settings(commonSettings)
265267
.settings(
266-
libraryDependencies += "org.postgresql" % "postgresql" % "42.7.11"
268+
libraryDependencies += "org.postgresql" % "postgresql" % "42.7.13"
267269
)
268270

269271
lazy val unidocs = project

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.12.11
1+
sbt.version=1.12.13

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel-site"
88
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.7.0")
99
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")
1010
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.4")
11-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.21.0")
11+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
1212
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.12")
1313
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.4.0")

0 commit comments

Comments
 (0)