Skip to content

Commit

Permalink
Merge pull request #20 from mblink/upd-deps-2024-02-15
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
mrdziuban authored Feb 15, 2024
2 parents f736a85 + de98121 commit 953a687
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,34 +23,34 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
scala: [2.13.10, 3.3.0]
scala: [2.13.12, 3.3.1]
java: [temurin@8, temurin@11, temurin@17]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
cache: sbt

- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
cache: sbt

- name: Setup Java (temurin@17)
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Delete artifacts
shell: bash {0}
run: |
# Customize those three lines with your repository and credentials:
REPO=${GITHUB_API_URL}/repos/${{ github.repository }}
Expand All @@ -25,7 +26,7 @@ jobs:
ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; }
# A temporary file which receives HTTP response headers.
TMPFILE=/tmp/tmp.$$
TMPFILE=$(mktemp)
# An associative array, key: artifact name, value: number of artifacts of that name.
declare -A ARTCOUNT
Expand Down
17 changes: 9 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Global / onChangedBuildSource := ReloadOnSourceChanges

lazy val scala213 = "2.13.10"
lazy val scala3 = "3.3.0"
lazy val scala213 = "2.13.12"
lazy val scala3 = "3.3.1"

ThisBuild / crossScalaVersions := Seq(scala213, scala3)

Expand Down Expand Up @@ -34,7 +34,8 @@ lazy val baseSettings = Seq(
organization := "typify",
version := "9.0.0",
resolvers += "bondlink-maven-repo" at "https://raw.githubusercontent.com/mblink/maven-repo/main",
mimaPreviousArtifacts := Set("typify" %%% name.value % "9.0.0"),
mimaPreviousArtifacts := Set(),
mimaFailOnNoPrevious := false,
libraryDependencies ++= foldScalaV(scalaVersion.value)(
Seq(compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.patch)),
Seq(),
Expand Down Expand Up @@ -71,11 +72,11 @@ lazy val root = project.in(file("."))
.settings(noPublishSettings)
.disablePlugins(MimaPlugin)

lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % "2.9.0")
lazy val circe = "io.circe" %% "circe-core" % "0.14.5"
lazy val formless = Def.setting("com.bondlink" %%% "formless" % "0.1.0")
lazy val json4s = "org.json4s" %% "json4s-jackson" % "4.0.6"
lazy val playJson = "com.typesafe.play" %% "play-json" % "2.10.0-RC9"
lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % "2.10.0")
lazy val circe = "io.circe" %% "circe-core" % "0.14.6"
lazy val formless = Def.setting("com.bondlink" %%% "formless" % "0.2.0")
lazy val json4s = "org.json4s" %% "json4s-jackson" % "4.0.7"
lazy val playJson = "org.playframework" %% "play-json" % "3.0.2"
lazy val shapeless = Def.setting("com.chuusai" %%% "shapeless" % "2.3.10")
lazy val scalacheck = Def.setting("org.scalacheck" %%% "scalacheck" % "1.17.0" % Test)

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.9.0
sbt.version=1.9.8
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.15.0")
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.23.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")

resolvers += "bondlink-maven-repo" at "https://raw.githubusercontent.com/mblink/maven-repo/main"
addSbtPlugin("bondlink" % "sbt-git-publish" % "0.0.5")

0 comments on commit 953a687

Please sign in to comment.