Skip to content

Commit

Permalink
Merge branch 'main' into update/scala-library-2.13.13
Browse files Browse the repository at this point in the history
  • Loading branch information
danicheg authored Mar 1, 2024
2 parents 9710d89 + 6a8cd4c commit 98bcf07
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:

- name: Upload target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
path: targets.tar
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
run: sbt +update

- name: Download target directories (2.13)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13

Expand All @@ -193,7 +193,7 @@ jobs:
rm targets.tar
- name: Download target directories (2.12)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12

Expand All @@ -203,7 +203,7 @@ jobs:
rm targets.tar
- name: Download target directories (3)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3

Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ThisBuild / developers := List(
url("https://github.com/ikhoon")
)
)
ThisBuild / crossScalaVersions := Seq("2.13.13", "2.12.18", "3.3.1")
ThisBuild / crossScalaVersions := Seq("2.13.13", "2.12.19", "3.3.1")
ThisBuild / scalaVersion := crossScalaVersions.value.head
ThisBuild / tlVersionIntroduced := Map("3" -> "0.5.0")
ThisBuild / tlCiReleaseBranches := Seq("main")
Expand All @@ -21,7 +21,7 @@ ThisBuild / resolvers += Resolver.mavenLocal
ThisBuild / Test / javaOptions += "-Dcom.linecorp.armeria.verboseResponses=true -Dcom.linecorp.armeria.verboseExceptions=always"

val versions = new {
val armeria = "1.27.1"
val armeria = "1.27.2"
val fs2 = "3.9.4"
val http4s = "0.23.25"
val logback = "1.2.13"
Expand Down Expand Up @@ -72,7 +72,7 @@ lazy val exampleArmeriaHttp4s = project
.in(file("examples/armeria-http4s"))
.settings(
name := "examples-armeria-http4s",
crossScalaVersions := Seq("2.13.13", "2.12.18"),
crossScalaVersions := Seq("2.13.13", "2.12.19"),
scalaVersion := crossScalaVersions.value.head,
libraryDependencies ++= List(
"ch.qos.logback" % "logback-classic" % versions.logback % Runtime,
Expand All @@ -88,7 +88,7 @@ lazy val exampleArmeriaScalaPB = project
.in(file("examples/armeria-scalapb"))
.settings(
name := "examples-armeria-scalapb",
crossScalaVersions := Seq("2.13.13", "2.12.18"),
crossScalaVersions := Seq("2.13.13", "2.12.19"),
scalaVersion := crossScalaVersions.value.head,
libraryDependencies ++= List(
"ch.qos.logback" % "logback-classic" % versions.logback % Runtime,
Expand All @@ -112,7 +112,7 @@ lazy val exampleArmeriaFs2Grpc = project
.in(file("examples/armeria-fs2grpc"))
.settings(
name := "examples-armeria-fs2grpc",
crossScalaVersions := Seq("2.13.13", "2.12.18"),
crossScalaVersions := Seq("2.13.13", "2.12.19"),
scalaVersion := crossScalaVersions.value.head,
libraryDependencies ++= List(
"ch.qos.logback" % "logback-classic" % versions.logback % Runtime,
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// http4s organization
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.2")
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.3")

// ScalaDoc API mapping
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
Expand Down

0 comments on commit 98bcf07

Please sign in to comment.