Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Scala 3.1.0 to build #847

Merged
merged 1 commit into from
Nov 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.0.2, 2.12.15, 2.13.6]
scala: [3.1.0, 3.0.2, 2.12.15, 2.13.6]
java: [adopt@1.8, adopt@1.11]
platform: [jvm]
workers: [1, 4]
include:
- workers: 1
os: ubuntu-latest
java: adopt@1.8
scala: 3.1.0
platform: js
- workers: 1
os: ubuntu-latest
java: adopt@1.8
Expand Down
11 changes: 9 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ sourceDirectory := file("dummy source directory")

val Scala212 = "2.12.15"
val Scala213 = "2.13.6"
val Scala3 = "3.0.2"
val Scala30 = "3.0.2"
val Scala31 = "3.1.0"

ThisBuild / crossScalaVersions := Seq(Scala3, Scala212, Scala213)
ThisBuild / crossScalaVersions := Seq(Scala31, Scala30, Scala212, Scala213)
ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.last

ThisBuild / githubWorkflowPublishTargetBranches := Seq()
Expand Down Expand Up @@ -180,6 +181,12 @@ lazy val sharedSettings = MimaSettings.settings ++ Seq(
}),
mimaPreviousArtifacts := Set("org.scalacheck" %%% "scalacheck" % "1.15.4"),

// Don't publish for Scala 3.1 or later, only from 3.0
publish / skip := (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, x)) if x > 0 => true
case _ => false
}),

publishTo := {
val nexus = "https://oss.sonatype.org/"
val (name, path) = if (isSnapshot.value) ("snapshots", "content/repositories/snapshots")
Expand Down
2 changes: 1 addition & 1 deletion examples/commands-leveldb/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "commands-leveldb"

scalaVersion := "3.0.2"
scalaVersion := "3.1.0"

libraryDependencies ++= Seq(
"org.scalacheck" %% "scalacheck" % "1.15.4" % Test,
Expand Down
2 changes: 1 addition & 1 deletion examples/commands-nix/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "commands-nix"

scalaVersion := "3.0.2"
scalaVersion := "3.1.0"

libraryDependencies ++= Seq(
"org.scalacheck" %% "scalacheck" % "1.15.4" % Test,
Expand Down
2 changes: 1 addition & 1 deletion examples/commands-redis/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "commands-redis"

scalaVersion := "3.0.2"
scalaVersion := "3.1.0"

libraryDependencies ++= Seq(
"org.scalacheck" %% "scalacheck" % "1.15.4" % Test,
Expand Down
2 changes: 1 addition & 1 deletion examples/scalajs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ name := "ScalaCheck-scalajs-example"

version := "0.1-SNAPSHOT"

scalaVersion := "3.0.2"
scalaVersion := "3.1.0"

libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.15.4" % Test
2 changes: 1 addition & 1 deletion examples/simple-sbt/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "scalacheck-demo"

scalaVersion := "3.0.2"
scalaVersion := "3.1.0"

libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.15.4" % Test

Expand Down