Merge pull request #6 from djspiewak/build/redo

Swapped to sbt-spiewak and implemented ci-release things

Author: mpilquist

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.11, 2.13.2, 0.25.0, 0.26.0-RC1]
+        scala: [0.25.0, 0.26.0-RC1, 2.12.11, 2.13.2]
         java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -81,8 +81,7 @@ jobs:
       - name: Check that workflows are up to date
         run: sbt ++${{ matrix.scala }} githubWorkflowCheck
 
-      - name: Build project
-        run: sbt ++${{ matrix.scala }} test
+      - run: sbt ++${{ matrix.scala }} ci
 
       - name: Upload target directory 'target' (${{ matrix.scala }})
         uses: actions/upload-artifact@v1
@@ -127,7 +126,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.10]
+        scala: [2.13.2]
         java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -178,18 +177,6 @@ jobs:
           path: ~/.sbt
           key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directory 'target' (2.12.11)
-        uses: actions/download-artifact@v1
-        with:
-          name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }}-target
-          path: target
-
-      - name: Download target directory 'target' (2.13.2)
-        uses: actions/download-artifact@v1
-        with:
-          name: target-${{ matrix.os }}-2.13.2-${{ matrix.java }}-target
-          path: target
-
       - name: Download target directory 'target' (0.25.0)
         uses: actions/download-artifact@v1
         with:
@@ -202,17 +189,17 @@ jobs:
           name: target-${{ matrix.os }}-0.26.0-RC1-${{ matrix.java }}-target
           path: target
 
-      - name: Download target directory 'munit/jvm/target' (2.12.11)
+      - name: Download target directory 'target' (2.12.11)
         uses: actions/download-artifact@v1
         with:
-          name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }}-munit_jvm_target
-          path: munit/jvm/target
+          name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }}-target
+          path: target
 
-      - name: Download target directory 'munit/jvm/target' (2.13.2)
+      - name: Download target directory 'target' (2.13.2)
         uses: actions/download-artifact@v1
         with:
-          name: target-${{ matrix.os }}-2.13.2-${{ matrix.java }}-munit_jvm_target
-          path: munit/jvm/target
+          name: target-${{ matrix.os }}-2.13.2-${{ matrix.java }}-target
+          path: target
 
       - name: Download target directory 'munit/jvm/target' (0.25.0)
         uses: actions/download-artifact@v1
@@ -226,17 +213,17 @@ jobs:
           name: target-${{ matrix.os }}-0.26.0-RC1-${{ matrix.java }}-munit_jvm_target
           path: munit/jvm/target
 
-      - name: Download target directory 'core/js/target' (2.12.11)
+      - name: Download target directory 'munit/jvm/target' (2.12.11)
         uses: actions/download-artifact@v1
         with:
-          name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }}-core_js_target
-          path: core/js/target
+          name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }}-munit_jvm_target
+          path: munit/jvm/target
 
-      - name: Download target directory 'core/js/target' (2.13.2)
+      - name: Download target directory 'munit/jvm/target' (2.13.2)
         uses: actions/download-artifact@v1
         with:
-          name: target-${{ matrix.os }}-2.13.2-${{ matrix.java }}-core_js_target
-          path: core/js/target
+          name: target-${{ matrix.os }}-2.13.2-${{ matrix.java }}-munit_jvm_target
+          path: munit/jvm/target
 
       - name: Download target directory 'core/js/target' (0.25.0)
         uses: actions/download-artifact@v1
@@ -250,17 +237,17 @@ jobs:
           name: target-${{ matrix.os }}-0.26.0-RC1-${{ matrix.java }}-core_js_target
           path: core/js/target
 
-      - name: Download target directory 'core/jvm/target' (2.12.11)
+      - name: Download target directory 'core/js/target' (2.12.11)
         uses: actions/download-artifact@v1
         with:
-          name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }}-core_jvm_target
-          path: core/jvm/target
+          name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }}-core_js_target
+          path: core/js/target
 
-      - name: Download target directory 'core/jvm/target' (2.13.2)
+      - name: Download target directory 'core/js/target' (2.13.2)
         uses: actions/download-artifact@v1
         with:
-          name: target-${{ matrix.os }}-2.13.2-${{ matrix.java }}-core_jvm_target
-          path: core/jvm/target
+          name: target-${{ matrix.os }}-2.13.2-${{ matrix.java }}-core_js_target
+          path: core/js/target
 
       - name: Download target directory 'core/jvm/target' (0.25.0)
         uses: actions/download-artifact@v1
@@ -274,17 +261,17 @@ jobs:
           name: target-${{ matrix.os }}-0.26.0-RC1-${{ matrix.java }}-core_jvm_target
           path: core/jvm/target
 
-      - name: Download target directory 'munit/js/target' (2.12.11)
+      - name: Download target directory 'core/jvm/target' (2.12.11)
         uses: actions/download-artifact@v1
         with:
-          name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }}-munit_js_target
-          path: munit/js/target
+          name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }}-core_jvm_target
+          path: core/jvm/target
 
-      - name: Download target directory 'munit/js/target' (2.13.2)
+      - name: Download target directory 'core/jvm/target' (2.13.2)
         uses: actions/download-artifact@v1
         with:
-          name: target-${{ matrix.os }}-2.13.2-${{ matrix.java }}-munit_js_target
-          path: munit/js/target
+          name: target-${{ matrix.os }}-2.13.2-${{ matrix.java }}-core_jvm_target
+          path: core/jvm/target
 
       - name: Download target directory 'munit/js/target' (0.25.0)
         uses: actions/download-artifact@v1
@@ -298,10 +285,25 @@ jobs:
           name: target-${{ matrix.os }}-0.26.0-RC1-${{ matrix.java }}-munit_js_target
           path: munit/js/target
 
+      - name: Download target directory 'munit/js/target' (2.12.11)
+        uses: actions/download-artifact@v1
+        with:
+          name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }}-munit_js_target
+          path: munit/js/target
+
+      - name: Download target directory 'munit/js/target' (2.13.2)
+        uses: actions/download-artifact@v1
+        with:
+          name: target-${{ matrix.os }}-2.13.2-${{ matrix.java }}-munit_js_target
+          path: munit/js/target
+
       - name: Download target directory 'project/target'
         uses: actions/download-artifact@v1
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-project_target
           path: project/target
 
-      - run: sbt ++${{ matrix.scala }} ci-release
+      - name: Import signing key
+        run: echo $PGP_SECRET | gpg --import
+
+      - run: sbt ++${{ matrix.scala }} release

build.sbt

@@ -1,7 +1,15 @@
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 import sbtcrossproject.CrossPlugin.autoImport.CrossType
 
-ThisBuild / crossScalaVersions := List("2.12.11", "2.13.2", "0.25.0", "0.26.0-RC1")
+ThisBuild / baseVersion := "0.0"
+
+ThisBuild / organization := "org.typelevel"
+ThisBuild / organizationName := "Typelevel"
+
+ThisBuild / publishGithubUser := "mpilquist"
+ThisBuild / publishFullName := "Michael Pilquist"
+
+ThisBuild / crossScalaVersions := List("0.25.0", "0.26.0-RC1", "2.12.11", "2.13.2")
 
 ThisBuild / githubWorkflowPublishTargetBranches := Seq(
   RefPredicate.Equals(Ref.Branch("main")),
@@ -14,87 +22,51 @@ ThisBuild / githubWorkflowEnv ++= Map(
   "PGP_PASSPHRASE" -> s"$${{ secrets.PGP_PASSPHRASE }}"
 )
 ThisBuild / githubWorkflowTargetTags += "v*"
-ThisBuild / githubWorkflowPublish := Seq(WorkflowStep.Sbt(List("ci-release")))
 
+ThisBuild / githubWorkflowPublishPreamble +=
+  WorkflowStep.Run(
+    List("echo $PGP_SECRET | gpg --import"),
+    name = Some("Import signing key"))
+
+ThisBuild / githubWorkflowPublish := Seq(WorkflowStep.Sbt(List("release")))
 
 lazy val root = project.in(file("."))
   .aggregate(core.jvm, core.js, munit.jvm, munit.js)
-  .settings(
-    publish := {},
-    publishLocal := {},
-    publishArtifact := false
-  )
+  .settings(noPublishSettings)
 
 val commonSettings = Seq(
-  organization := "org.typelevel",
   homepage := Some(url("https://github.com/typelevel/scalacheck-effect")),
   licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
-  developers := List(
-    Developer(
-      "mpilquist",
-      "Michael Pilquist",
-      "mpilquist@gmail.com",
-      url("https://github.com/mpilquist")
-    )
-  ),
-
-  scalacOptions ++= List("-feature", "-language:higherKinds,implicitConversions") ++
-    (scalaBinaryVersion.value match {
-      case v if v.startsWith("2.13") => List("-Xlint", "-Yrangepos")
-      case v if v.startsWith("2.12") => Nil
-      case v if v.startsWith("0.") => Nil
-      case other => sys.error(s"Unsupported scala version: $other")
-    }),
 
   libraryDependencies ++= {
     if (isDotty.value) Nil
     else Seq(scalafixSemanticdb)
   },
 
-  crossScalaVersions := {
-    val default = crossScalaVersions.value
-    if (crossProjectPlatform.value.identifier != "jvm")
-      default.filter(_.startsWith("2."))
-    else
-      default
-  },
-
-  scalafmtOnCompile := true,
-
-  Compile / doc / sources := {
-    val old = (Compile / doc / sources).value
-    if (isDotty.value)
-      Seq()
-    else
-      old
-  },
-  Test / doc / sources := {
-    val old = (Test / doc / sources).value
-    if (isDotty.value)
-      Seq()
-    else
-      old
-  }
+  scalafmtOnCompile := true
 )
 
 lazy val core = crossProject(JSPlatform, JVMPlatform).settings(commonSettings).settings(
   name := "scalacheck-effect",
 
   libraryDependencies ++= List(
-    ("org.typelevel"  %%% "cats-core" % "2.1.1").withDottyCompat(scalaVersion.value),
-    ("org.scalacheck" %% "scalacheck" % "1.14.3").withDottyCompat(scalaVersion.value)
-  )
+    "org.typelevel"  %%% "cats-core" % "2.1.1",
+    "org.scalacheck" %% "scalacheck" % "1.14.3"),
+
+  Compile / scalacOptions ~= { _.filterNot(_ == "-Xfatal-warnings") }   // we need to turn this off because scalacheck's API uses Stream, which is deprecated
 )
+.settings(dottyLibrarySettings)
+.settings(dottyJsSettings(ThisBuild / crossScalaVersions))
 
 lazy val munit = crossProject(JSPlatform, JVMPlatform).settings(commonSettings).settings(
   name := "scalacheck-effect-munit",
 
-  libraryDependencies ++= List(
-    "org.scalameta" %%% "munit-scalacheck" % "0.7.10",
-    ("org.typelevel"  %%% "cats-effect" % "2.1.4" % "test").withDottyCompat(scalaVersion.value)
-  ),
+  libraryDependencies += "org.typelevel"  %%% "cats-effect" % "2.1.4" % Test,
 
   testFrameworks += new TestFramework("munit.Framework")
 ).jsSettings(
   scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
 ).dependsOn(core)
+.settings(dottyLibrarySettings)
+.settings(dottyJsSettings(ThisBuild / crossScalaVersions))
+.settings(libraryDependencies += "org.scalameta" %%% "munit-scalacheck" % "0.7.10")

core/shared/src/main/scala/org/scalacheck/effect/PropF.scala

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 Typelevel
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.scalacheck.effect
 
 import scala.collection.immutable.Stream
@@ -6,9 +22,7 @@ import scala.collection.immutable.Stream.#::
 import cats.MonadError
 import cats.implicits._
 import org.scalacheck.{Arbitrary, Gen, Prop, Shrink, Test}
-import org.scalacheck.rng.Seed
 import org.scalacheck.util.{FreqMap, Pretty}
-import scala.collection.immutable.Stream.Cons
 
 /**
   * An effectful property.
@@ -202,7 +216,7 @@ object PropF {
           case None => PropF.undecided
         }
       } catch {
-        case e: Gen.RetrievalError => PropF.undecided
+        case _: Gen.RetrievalError => PropF.undecided
       }
     }
 
@@ -552,8 +566,8 @@ object PropF {
         if (xs.isEmpty) F.pure(res)
         else
           getFirstFailure(xs).flatMap {
-            case Right((x2, r2)) => F.pure(res)
-            case Left((x2, r2))  => shrinker(x2, replOrig(r, r2), shrinks + 1, orig)
+            case Right((_, _))  => F.pure(res)
+            case Left((x2, r2)) => shrinker(x2, replOrig(r, r2), shrinks + 1, orig)
           }
       }
 

munit/shared/src/main/scala/munit/ScalaCheckEffectSuite.scala

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 Typelevel
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package munit
 
 import scala.concurrent.Future

munit/shared/src/test/scala/munit/Example.scala

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 Typelevel
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package munit
 
 import cats.effect.IO

project/plugins.sbt

@@ -4,9 +4,7 @@ val scalaJSVersion =
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
+addSbtPlugin("com.codecommit" % "sbt-spiewak" % "0.14.0")
 addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.8.1")
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.1")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.2")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.19")
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")