Merge pull request #213 from alexarchambault/develop

Updates
alexarchambault · May 23, 2021 · a1c12b6 · a1c12b6
2 parents 41d1bb7 + a06018a
commit a1c12b6
Show file tree

Hide file tree

Showing 34 changed files with 171 additions and 251 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/scripts/gpg-setup.sh b/.github/scripts/gpg-setup.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+# from https://github.com/coursier/apps/blob/f1d2bf568bf466a98569a85c3f23c5f3a8eb5360/.github/scripts/gpg-setup.sh
+
+echo $PGP_SECRET | base64 --decode | gpg --import --no-tty --batch --yes
+
+echo "allow-loopback-pinentry" >>~/.gnupg/gpg-agent.conf
+echo "pinentry-mode loopback" >>~/.gnupg/gpg.conf
+
+gpg-connect-agent reloadagent /bye
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,53 @@
+name: CI
+on:
+  push:
+    branches:
+    - master
+    tags:
+    - "v*"
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        SCALA_VERSION: ["2.12.13", "2.13.6"]
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        submodules: true
+    - uses: coursier/cache-action@v6.1
+    - uses: laughedelic/coursier-setup@v1
+      with:
+        jvm: 8
+        apps: sbt-launcher:1.2.22
+    - name: Test
+      run: sbt ++${{ matrix.SCALA_VERSION }} test mimaReportBinaryIssues
+
+  publish:
+    needs: test
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        submodules: true
+    - uses: coursier/cache-action@v6.1
+    - uses: laughedelic/coursier-setup@v1
+      with:
+        jvm: 8
+        apps: sbt-launcher:1.2.22
+    - run: .github/scripts/gpg-setup.sh
+      env:
+        PGP_SECRET: ${{ secrets.PGP_SECRET }}
+    - name: Release
+      run: sbt ci-release
+      env:
+        PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+        PGP_SECRET: ${{ secrets.PGP_SECRET }}
+        SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /.idea
 /.idea_modules
 target/
+.bsp/
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ libraryDependencies +=
   compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.patch)
 ```
 
-scalacheck-shapeless depends on shapeless 2.3 and scalacheck 1.14. It is built against scala 2.10, 2.11, and 2.12.
+scalacheck-shapeless depends on shapeless 2.3 and scalacheck 1.14. It is built against scala 2.12, and 2.13.
 
 If you are using shapeless 2.2 along with scalacheck 1.13, use the `1.0.0` version. If you are
 using shapeless 2.2 along with scalacheck 1.12, see the

diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,4 @@
 
-import Aliases._
-import Settings._
-
 import sbtcrossproject.crossProject
 
 inThisBuild(List(
@@ -16,15 +13,22 @@ inThisBuild(List(
   ))
 ))
 
-lazy val core = crossProject(JSPlatform, JVMPlatform)
+lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .settings(
-    shared,
-    name := "scalacheck-shapeless_1.14",
+    scalaVersion := Scala.scala213,
+    crossScalaVersions := Scala.all,
+    scalacOptions ++= Seq(
+      "-deprecation"
+    ),
+    name := "scalacheck-shapeless_1.15",
     moduleName := name.value, // keep the '.' in name ^
-    libs ++= Seq(
+    libraryDependencies ++= Seq(
       Deps.scalacheck.value,
-      Deps.shapeless.value
-    )
+      Deps.shapeless.value,
+      Deps.utest.value % Test
+    ),
+    testFrameworks += new TestFramework("utest.runner.Framework"),
+    mimaPreviousArtifacts := Set.empty
   )
   .jsSettings(
     scalaJSStage.in(Test) := FastOptStage
@@ -33,25 +37,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
 lazy val coreJVM = core.jvm
 lazy val coreJS = core.js
 
-lazy val test = crossProject(JSPlatform, JVMPlatform)
-  .dependsOn(core)
-  .disablePlugins(MimaPlugin)
-  .settings(
-    shared,
-    skip.in(publish) := true,
-    utest
-  )
-  .jsSettings(
-    scalaJSStage.in(Test) := FastOptStage
-  )
-
-lazy val testJVM = test.jvm
-lazy val testJS = test.js
-
 
 disablePlugins(MimaPlugin)
 skip.in(publish) := true
 crossScalaVersions := Nil
-
-ThisBuild / evictionRules += "org.scala-js" % "*" % "semver"
-ThisBuild / compatibilityRules += "org.scala-js" % "*" % "semver"
diff --git a/core/shared/src/main/scala/org/scalacheck/derive/MkArbitrary.scala b/core/shared/src/main/scala/org/scalacheck/derive/MkArbitrary.scala
@@ -72,7 +72,7 @@ object MkArbitrary extends MkArbitraryLowPriority {
       )
     )
 
-  @deprecated("Kept for binary compatibility purposes only.")
+  @deprecated("Kept for binary compatibility purposes only.", "1.1.7")
   def genericCoproduct[S, C <: Coproduct](
     gen: Generic.Aux[S, C],
     mkArb: Lazy[MkCoproductArbitrary[C]]

diff --git a/core/shared/src/main/scala/org/scalacheck/derive/MkShrink.scala b/core/shared/src/main/scala/org/scalacheck/derive/MkShrink.scala
@@ -28,7 +28,7 @@ object MkShrink {
       def shrink = shrink0
     }
 
-  private def lazyxmap[T, U](from: T => U, to: U => T)(st: => Shrink[T]): Shrink[U] = Shrink[U] { u: U ⇒
+  private def lazyxmap[T, U](from: T => U, to: U => T)(st: => Shrink[T]): Shrink[U] = Shrink[U] { u: U =>
     st.shrink(to(u)).map(from)
   }
 

diff --git a/...scala/org/scalacheck/ArbitraryTests.scala → ...scala/org/scalacheck/ArbitraryTests.scala b/...scala/org/scalacheck/ArbitraryTests.scala → ...scala/org/scalacheck/ArbitraryTests.scala
@@ -2,7 +2,7 @@ package org.scalacheck
 
 import org.scalacheck.derive._
 
-import shapeless._
+import shapeless.{test => _, _}
 import shapeless.labelled.FieldType
 import shapeless.record._
 import shapeless.union._
@@ -487,12 +487,12 @@ object ArbitraryTests extends TestSuite {
 
   val tests = TestSuite {
 
-    'compareSuccess - {
+    test("compareSuccess") {
       val arb = Arbitrary.arbInt.arbitrary
       compareArbitrary(arb, arb)
     }
 
-    'compareFailure - {
+    test("compareFailure") {
       val arb = Arbitrary.arbInt
       val result =
         try {
@@ -506,7 +506,7 @@ object ArbitraryTests extends TestSuite {
       assert(result)
     }
 
-    'empty - {
+    test("empty") {
       val expectedArb =
         MkArbitrary.genericProduct(
           Generic[Empty.type],
@@ -517,7 +517,7 @@ object ArbitraryTests extends TestSuite {
       compareArbitrary(expectedArb.arbitrary, gen)
     }
 
-    'emptyCC - {
+    test("emptyCC") {
       val expectedArb =
         MkArbitrary.genericProduct(
           Generic[EmptyCC],
@@ -528,114 +528,114 @@ object ArbitraryTests extends TestSuite {
       compareArbitrary(expectedArb.arbitrary, gen)
     }
 
-    'simple - {
+    test("simple") {
       val gen = Arbitrary.arbitrary[Simple]
       compareArbitrary(expectedSimpleArb.arbitrary, gen)
     }
 
-    'simpleHList - {
+    test("simpleHList") {
       val gen = Arbitrary.arbitrary[Int :: String :: Boolean :: HNil]
       compareArbitrary(expectedIntStringBoolArb.arbitrary, gen)
     }
 
-    'simpleCoproduct - {
+    test("simpleCoproduct") {
       val gen = Arbitrary.arbitrary[Int :+: String :+: Boolean :+: CNil]
       compareArbitrary(expectedIntStringBoolCoproductArb.arbitrary, gen)
     }
 
-    'composed - {
+    test("composed") {
       val gen = Arbitrary.arbitrary[Composed]
       compareArbitrary(expectedComposedArb.arbitrary, gen)
     }
 
-    'twiceComposed - {
+    test("twiceComposed") {
       val gen = Arbitrary.arbitrary[TwiceComposed]
       compareArbitrary(expectedTwiceComposedArb.arbitrary, gen)
     }
 
-    'composedOptList - {
+    test("composedOptList") {
       val gen = Arbitrary.arbitrary[ComposedOptList]
       compareArbitrary(expectedComposedOptListArb.arbitrary, gen)
     }
 
-    'base - {
+    test("base") {
       val gen = Arbitrary.arbitrary[Base]
       compareArbitrary(expectedBaseArb.arbitrary, gen)
     }
 
-    'tree1 - {
+    test("tree1") {
       val gen = Arbitrary.arbitrary[T1.Tree]
       compareArbitrary(expectedT1TreeArbitrary.arbitrary, gen)
     }
 
-    'tree2 - {
+    test("tree2") {
       val gen = Arbitrary.arbitrary[T2.Tree]
       compareArbitrary(expectedT2TreeArbitrary.arbitrary, gen)
     }
 
-    'a - {
+    test("a") {
       val gen = Arbitrary.arbitrary[A]
       compareArbitrary(expectedAArbitrary.arbitrary, gen)
     }
 
-    'd - {
+    test("d") {
       val gen = Arbitrary.arbitrary[D]
       compareArbitrary(expectedDArbitrary.arbitrary, gen)
     }
 
-    'list - {
+    test("list") {
       val expected = Arbitrary.arbContainer[List, Int](Arbitrary.arbInt, implicitly, identity)
       val gen = Arbitrary.arbitrary[List[Int]]
       compareArbitrary(expected.arbitrary, gen)
     }
 
-    'option - {
+    test("option") {
       val expected = Arbitrary.arbOption(Arbitrary.arbInt)
       val gen = Arbitrary.arbitrary[Option[Int]]
       compareArbitrary(expected.arbitrary, gen)
     }
 
-    'singleton - {
-      'simple - {
+    test("singleton") {
+      test("simple") {
         val expected = Arbitrary(Gen.const(2: Witness.`2`.T))
         val gen = Arbitrary.arbitrary[Witness.`2`.T]
         compareArbitrary(expected.arbitrary, gen)
       }
 
-      'caseClass - {
+      test("caseClass") {
         val gen = Arbitrary.arbitrary[CCWithSingleton]
         compareArbitrary(expectedCCWithSingletonArb.arbitrary, gen)
       }
 
-      'ADT - {
+      test("ADT") {
         val gen = Arbitrary.arbitrary[BaseWithSingleton]
         compareArbitrary(expectedBaseWithSingletonArb.arbitrary, gen)
       }
     }
 
-    'shapeless - {
-      'hlist - {
+    test("shapeless") {
+      test("hlist") {
         val gen = Arbitrary.arbitrary[L]
         compareArbitrary(expectetLArbitrary.arbitrary, gen)
       }
 
-      'record - {
+      test("record") {
         val gen = Arbitrary.arbitrary[Rec]
         compareArbitrary(expectetRecArbitrary.arbitrary, gen)
       }
 
-      'copproduct - {
+      test("copproduct") {
         val gen = Arbitrary.arbitrary[C0]
         compareArbitrary(expectetC0Arbitrary.arbitrary, gen)
       }
 
-      'union - {
+      test("union") {
         val gen = Arbitrary.arbitrary[Un]
         compareArbitrary(expectedUnionArbitrary.arbitrary, gen)
       }
     }
 
-    'enumeration - {
+    test("enumeration") {
       val expected = Arbitrary(Gen.oneOf(WeekDay.values.toSeq))
       val gen = Arbitrary.arbitrary[WeekDay.Value]
       compareArbitrary(expected.arbitrary, gen)