Skip to content

Commit

Permalink
Merge pull request #93 from http4s/updates-for-scala3
Browse files Browse the repository at this point in the history
Updates for scala3
  • Loading branch information
froth authored May 7, 2024
2 parents 59042c4 + 6af40a1 commit ba27766
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 13 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,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
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ ThisBuild / githubWorkflowJavaVersions := Seq(
)
ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty

val Http4sVersion = "0.23.25"
val CirceVersion = "0.14.6"
val Http4sVersion = "0.23.27"
val CirceVersion = "0.14.7"
val MunitVersion = "0.7.29"
val LogbackVersion = "1.4.14"
val LogbackVersion = "1.5.6"
val MunitCatsEffectVersion = "1.0.7"

lazy val root = project.in(file("."))
Expand All @@ -48,9 +48,9 @@ lazy val root = project.in(file("."))
"org.typelevel" %% "munit-cats-effect-3" % MunitCatsEffectVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion % Runtime,
),
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0"),
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1"),
addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0"),
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5"),
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0"),
Test / test := {
val _ = (Test / g8Test).toTask("").value
},
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.8
sbt.version=1.10.0
2 changes: 1 addition & 1 deletion project/plugin.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2")
addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.6.5")
addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.1")

8 changes: 4 additions & 4 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
val Http4sVersion = "0.23.25"
val CirceVersion = "0.14.6"
val Http4sVersion = "0.23.27"
val CirceVersion = "0.14.7"
val MunitVersion = "0.7.29"
val LogbackVersion = "1.4.14"
val LogbackVersion = "1.5.6"
val MunitCatsEffectVersion = "1.0.7"

lazy val root = (project in file("."))
.settings(
organization := "$organization$",
name := "$name;format="norm"$",
version := "0.0.1-SNAPSHOT",
scalaVersion := "3.3.0",
scalaVersion := "3.3.3",
libraryDependencies ++= Seq(
"org.http4s" %% "http4s-ember-server" % Http4sVersion,
"org.http4s" %% "http4s-ember-client" % Http4sVersion,
Expand Down
2 changes: 1 addition & 1 deletion src/main/g8/project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.9.8
sbt.version=1.10.0

2 changes: 1 addition & 1 deletion src/main/g8/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")

0 comments on commit ba27766

Please sign in to comment.