Skip to content

Commit

Permalink
Merge branch 'series/1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
rossabaker committed Apr 4, 2021
2 parents a745398 + d8e065e commit 0a8cf5e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ name: Continuous Integration

on:
pull_request:
branches: ['*']
branches: ['*', series/*]
push:
branches: ['*']
branches: ['*', series/*]
tags: [v*]

env:
Expand Down
9 changes: 9 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ ThisBuild / scalaVersion := crossScalaVersions.value.filter(_.startsWith("2.")).
ThisBuild / baseVersion := "2.0"
ThisBuild / publishGithubUser := "rossabaker"
ThisBuild / publishFullName := "Ross A. Baker"
ThisBuild / githubWorkflowTargetBranches := List("*", "series/*")
ThisBuild / githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v")))

val JawnVersion = "1.1.1"
Expand All @@ -21,3 +22,11 @@ libraryDependencies ++= Seq(
"co.fs2" %% "fs2-io" % Fs2Version % Test,
"org.specs2" %% "specs2-core" % Specs2Version % Test withDottyCompat scalaVersion.value,
)

versionIntroduced := Map(
"3.0.0-M1" -> "1.0.1",
"3.0.0-M2" -> "1.0.1",
"3.0.0-M3" -> "1.0.1",
"3.0.0-RC1" -> "1.1.0",
"3.0.0-RC2" -> "1.1.1",
)

0 comments on commit 0a8cf5e

Please sign in to comment.