Skip to content

Commit

Permalink
Merge branch 'main' into update/munit-1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
etspaceman authored Oct 4, 2024
2 parents de71293 + c112112 commit 2c210ff
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 25 deletions.
22 changes: 21 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,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 @@ -115,13 +119,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 @@ -156,6 +164,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 @@ -212,6 +224,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 @@ -275,6 +291,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
2 changes: 1 addition & 1 deletion project/KinesisMockPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ object KinesisMockPluginKeys {
lazy val npmCopyExtraFiles =
taskKey[Unit]("Copy extra files to the NPM install directory")

val Scala213 = "2.13.14"
val Scala213 = "2.13.15"

val testDependencies = Def.setting(
Seq(
Expand Down
18 changes: 9 additions & 9 deletions project/LibraryDependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import sbt._
object LibraryDependencies {
val KindProjector = "org.typelevel" % "kind-projector" % "0.13.3"
val BetterMonadicFor = "com.olegpy" %% "better-monadic-for" % "0.3.1"
val ScodecBits = Def.setting("org.scodec" %%% "scodec-bits" % "1.2.0")
val ScodecBits = Def.setting("org.scodec" %%% "scodec-bits" % "1.2.1")
val ScalaParserCombinators = Def.setting(
"org.scala-lang.modules" %%% "scala-parser-combinators" % "2.4.0"
)
val Logback = "ch.qos.logback" % "logback-classic" % "1.5.6"
val Logback = "ch.qos.logback" % "logback-classic" % "1.5.8"

object Borer {
val borerVersion = "1.8.0"
Expand Down Expand Up @@ -36,11 +36,11 @@ object LibraryDependencies {
}

object Aws {
val sdkVersion = "2.26.7"
val sdkVersion = "2.28.15"
val utils = "software.amazon.awssdk" % "utils" % sdkVersion
val kinesis = "software.amazon.awssdk" % "kinesis" % sdkVersion
val cloudwatch = "software.amazon.awssdk" % "cloudwatch" % sdkVersion
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 All @@ -53,15 +53,15 @@ object LibraryDependencies {
}

object Http4s {
val http4sVersion = "0.23.27"
val http4sVersion = "0.23.28"
val circe = Def.setting("org.http4s" %%% "http4s-circe" % http4sVersion)
val dsl = Def.setting("org.http4s" %%% "http4s-dsl" % http4sVersion)
val emberServer =
Def.setting("org.http4s" %%% "http4s-ember-server" % http4sVersion)
}

object Circe {
val circeVersion = "0.14.8"
val circeVersion = "0.14.10"
val core = Def.setting("io.circe" %%% "circe-core" % circeVersion)
val parser = Def.setting("io.circe" %%% "circe-parser" % circeVersion)
val fs2 = Def.setting("io.circe" %%% "circe-fs2" % "0.14.1")
Expand All @@ -73,7 +73,7 @@ object LibraryDependencies {
}

object Enumeratum {
val enumeratumVersion = "1.7.3"
val enumeratumVersion = "1.7.5"
val cats =
Def.setting("com.beachape" %%% "enumeratum-cats" % enumeratumVersion)
val core = Def.setting("com.beachape" %%% "enumeratum" % enumeratumVersion)
Expand All @@ -86,14 +86,14 @@ object LibraryDependencies {
}

object FS2 {
val fs2Version = "3.10.2"
val fs2Version = "3.11.0"
val core = Def.setting("co.fs2" %%% "fs2-core" % fs2Version)
val io = Def.setting("co.fs2" %%% "fs2-io" % fs2Version)
}

object Kinesis {
val kcl = "software.amazon.kinesis" % "amazon-kinesis-client" % "2.6.0"
val kpl = "com.amazonaws" % "amazon-kinesis-producer" % "0.15.10"
val kpl = "com.amazonaws" % "amazon-kinesis-producer" % "0.15.11"
val sdkV1 = "com.amazonaws" % "aws-java-sdk-kinesis" % "1.11.190"
val sdkV2 = "software.amazon.awssdk" % "kinesis" % "2.24.12"
}
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
24 changes: 12 additions & 12 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
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.typelevel" % "sbt-typelevel-settings" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-github" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-versioning" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-ci" % "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-kernel" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-no-publish" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-github" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-versioning" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-ci" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-kernel" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-no-publish" % "0.7.3")
addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "1.3.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("io.chrisdavenport" %% "sbt-npm-package" % "0.2.0")
// 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")
libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
libraryDependencies ++= Seq(
"org.slf4j" % "slf4j-nop" % "2.0.13"
"org.slf4j" % "slf4j-nop" % "2.0.16"
)

0 comments on commit 2c210ff

Please sign in to comment.