From f8197780624e17fe9d8b4bda09fe0c1dc8a687fc Mon Sep 17 00:00:00 2001 From: Barry O'Neill Date: Tue, 26 Nov 2024 16:30:13 -0500 Subject: [PATCH] bump libs --- .github/workflows/build.yaml | 28 +++++++++++++++++++++ .github/workflows/ci.yaml | 47 ----------------------------------- .github/workflows/release.yml | 2 +- project/Dependencies.scala | 16 ++++++------ project/plugins.sbt | 2 +- 5 files changed, 37 insertions(+), 58 deletions(-) create mode 100644 .github/workflows/build.yaml delete mode 100644 .github/workflows/ci.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..3a078d8 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,28 @@ +name: CI +on: + pull_request: + branches: ['*'] + push: + branches: [main] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install Java And Sbt + uses: olafurpg/setup-scala@v14 + with: + java-version: corretto@1.17 + - name: Cache SBT + uses: actions/cache@v4 + with: + path: | + ~/.cache/coursier/v1 + ~/.sbt + key: sbt-${{ hashFiles('**/build.sbt') }} + - name: Run tests + run: sbt build + diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml deleted file mode 100644 index 52baa55..0000000 --- a/.github/workflows/ci.yaml +++ /dev/null @@ -1,47 +0,0 @@ -name: CI -on: - pull_request: - branches: - - '*' - push: - branches: - - main -jobs: - build: - name: Test - strategy: - matrix: - scala: - - 2.13.15 - - 3.3.4 - java: - - corretto@1.17 - os: - - ubuntu-22.04 - runs-on: ${{ matrix.os }} - steps: - - name: Branch Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Install Java And Sbt - uses: olafurpg/setup-scala@v14 - with: - java-version: ${{ matrix.java }} - - name: Cache - uses: actions/cache@v4 - with: - path: | - $HOME/.cache/coursier - $HOME/.ivy2/cache - $HOME/.sbt/boot/ - $HOME/.sbt - lib_managed - target - project/target - key: ${{ runner.os }}-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Test (${{ matrix.scala }}, ${{ matrix.java }}) - run: sbt ++${{ matrix.scala }} build - - name: Upload To Codecov - uses: codecov/codecov-action@v2 - diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6478fae..da38987 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: tags: ["*"] jobs: publish: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b61e38b..b880b58 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,20 +13,18 @@ object Dependencies { ).map(_ % Test) ) - val Slack = libraryDependencies += "com.slack.api" % "slack-app-backend" % "1.44.1" + val Slack = libraryDependencies += "com.slack.api" % "slack-app-backend" % "1.44.2" val Refined = libraryDependencies += "eu.timepit" %% "refined" % "0.11.2" val NewTypes = libraryDependencies += "io.monix" %% "newtypes-core" % "0.3.0" - val Logging = Seq( - libraryDependencies ++= Seq( - "org.typelevel" %% "log4cats-slf4j" % "2.7.0", - "ch.qos.logback" % "logback-classic" % "1.5.12" % Test, - "ch.qos.logback" % "logback-core" % "1.5.12" % Test, - "org.slf4j" % "jcl-over-slf4j" % "2.0.16" % Test, - "org.slf4j" % "jul-to-slf4j" % "2.0.16" % Test - ) + val Logging = libraryDependencies ++= Seq( + "org.typelevel" %% "log4cats-slf4j" % "2.7.0", + "ch.qos.logback" % "logback-classic" % "1.5.12" % Test, + "ch.qos.logback" % "logback-core" % "1.5.12" % Test, + "org.slf4j" % "jcl-over-slf4j" % "2.0.16" % Test, + "org.slf4j" % "jul-to-slf4j" % "2.0.16" % Test ) val Http4s = libraryDependencies ++= Seq( diff --git a/project/plugins.sbt b/project/plugins.sbt index eeb48d6..086ea4d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("io.laserdisc" % "sbt-laserdisc-defaults" % "0.1.1") +addSbtPlugin("io.laserdisc" % "sbt-laserdisc-defaults" % "0.2.0") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")