Skip to content

Commit

Permalink
Merge branch 'main' into update/feral-lambda-0.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
etspaceman authored Oct 4, 2024
2 parents 976d8d5 + 190fd54 commit 0ecf6d7
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 18 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.17
3ad6e6596ea9e957eb1967c0348003728dff6dec

# Scala Steward: Reformat with scalafmt 3.8.3
cac7c51d1c3fe5f759ba5aad8a461bbf40aea1d7
18 changes: 17 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -136,6 +140,10 @@ jobs:
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -270,13 +278,17 @@ jobs:

dependency-submission:
name: Submit Dependencies
if: github.event_name != 'pull_request'
if: github.event.repository.fork == false && github.event_name != 'pull_request'
strategy:
matrix:
os: [ubuntu-latest]
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -334,6 +346,10 @@ jobs:
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
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.2
version = 3.8.3
project.git = true
runner.dialect = scala213Source3

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class KPLCirisSpec extends munit.CatsEffectSuite {
.safeTransform(BuildInfo.kplUserRecordTimeout.asMillisUnsafe)(
_.setUserRecordTimeoutInMillis(_)
), KPLProducer.Config.GracefulShutdown(
BuildInfo.kplGracefulShutdownFlushAttempts.toInt,
BuildInfo.kplGracefulShutdownFlushAttempts.toInt,
BuildInfo.kplGracefulShutdownFlushInterval.asFiniteDurationUnsafe
))
// format: on
Expand Down
4 changes: 2 additions & 2 deletions project/Kinesis4CatsPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ object Kinesis4CatsPlugin extends AutoPlugin {
}

object Kinesis4CatsPluginKeys {
val Scala212 = "2.12.19"
val Scala213 = "2.13.14"
val Scala212 = "2.12.20"
val Scala213 = "2.13.15"
val Scala3 = "3.3.3"

val allScalaVersions = List(Scala213, Scala3, Scala212)
Expand Down
8 changes: 4 additions & 4 deletions project/LibraryDependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
import sbt._

object LibraryDependencies {
val Logback = "ch.qos.logback" % "logback-classic" % "1.5.6"
val Logback = "ch.qos.logback" % "logback-classic" % "1.5.8"
val JavaXMLBind = "javax.xml.bind" % "jaxb-api" % "2.3.1"
val Scalacheck = Def.setting("org.scalacheck" %%% "scalacheck" % "1.17.1")
val Epollcat = Def.setting("com.armanbilge" %%% "epollcat" % "0.1.6")
Expand All @@ -13,7 +13,7 @@ object LibraryDependencies {
}

object FS2 {
val fs2Version = "3.10.2"
val fs2Version = "3.11.0"
val core = Def.setting("co.fs2" %%% "fs2-core" % fs2Version)
val reactiveStreams = "co.fs2" %% "fs2-reactive-streams" % fs2Version
}
Expand Down Expand Up @@ -64,7 +64,7 @@ object LibraryDependencies {
"com.github.awslabs.kinesis-aggregation" % "amazon-kinesis-aggregator" % "2.0.3-deagg"
}

val kpl = "com.amazonaws" % "amazon-kinesis-producer" % "0.15.10"
val kpl = "com.amazonaws" % "amazon-kinesis-producer" % "0.15.11"
val kcl = "software.amazon.kinesis" % "amazon-kinesis-client" % "2.6.0"
}

Expand Down Expand Up @@ -94,7 +94,7 @@ object LibraryDependencies {
}

object Http4s {
val http4sVersion = "0.23.27"
val http4sVersion = "0.23.28"
val emberServer =
Def.setting("org.http4s" %%% "http4s-ember-server" % http4sVersion)
val emberClient =
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.10.0
sbt.version=1.10.2
16 changes: 8 additions & 8 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.3")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "1.3.2")
addSbtPlugin(
"com.disneystreaming.smithy4s" % "smithy4s-sbt-codegen" % "0.18.22"
"com.disneystreaming.smithy4s" % "smithy4s-sbt-codegen" % "0.18.24"
)
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew" % "0.3.0")
addSbtPlugin(
"com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.3.0"
Expand All @@ -20,10 +20,10 @@ addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7")

// Explicitly bumping until sbt-typelevel upgrades.
// Older versions exit sbt on compilation failures.
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.3")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1")

libraryDependencies ++= Seq(
"com.thesamet.scalapb" %% "compilerplugin" % "0.11.15",
"org.slf4j" % "slf4j-nop" % "2.0.13"
"org.slf4j" % "slf4j-nop" % "2.0.16"
)
libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always

0 comments on commit 0ecf6d7

Please sign in to comment.