Merge branch 'main' into update-and-apply-scalafmt

rallyhealth · Oct 10, 2022 · 83c00c1 · 83c00c1
2 parents 07cb459 + e599bbc
commit 83c00c1
Show file tree

Hide file tree

Showing 29 changed files with 15 additions and 1,803 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
         run: sbt ++${{ matrix.scala }} test
 
       - name: Compress target directories
-        run: tar cf targets.tar joda/target/1-16-jvm-2.13 joda/target/1-16-jvm-3 core/target/1-13-jvm-2.11 core/target/1-15-jvm-2.13 core/target/1-16-js-3 joda/target/1-13-jvm-2.11 joda/target/1-13-jvm-2.12 core/target/1-16-native-2.13 core/target/1-16-native-3 core/target/1-13-jvm-2.12 core/target/1-15-jvm-2.12 joda/target/1-12-jvm-2.11 core/target/1-15-js-2.12 joda/target/1-15-jvm-3 joda/target/1-15-jvm-2.13 core/target/1-16-jvm-3 core/target/1-15-js-2.13 joda/target/1-14-jvm-2.13 target core/target/1-15-jvm-3 core/target/1-15-js-3 joda/target/1-14-jvm-2.12 core/target/1-16-js-2.12 core/target/1-15-native-3 core/target/1-14-jvm-2.11 core/target/1-16-jvm-2.13 joda/target/1-16-jvm-2.12 joda/target/1-15-jvm-2.12 core/target/1-16-js-2.13 core/target/1-16-jvm-2.12 core/target/1-14-jvm-2.12 joda/target/1-14-jvm-2.11 core/target/1-12-jvm-2.11 core/target/1-14-jvm-2.13 core/target/1-15-native-2.13 project/target
+        run: tar cf targets.tar joda/target/1-16-jvm-2.13 joda/target/1-16-jvm-3 core/target/1-15-jvm-2.13 core/target/1-16-js-3 joda/target/1-13-jvm-2.12 core/target/1-16-native-2.13 core/target/1-16-native-3 core/target/1-13-jvm-2.12 core/target/1-15-jvm-2.12 core/target/1-15-js-2.12 joda/target/1-15-jvm-3 joda/target/1-15-jvm-2.13 core/target/1-16-jvm-3 core/target/1-15-js-2.13 joda/target/1-14-jvm-2.13 target core/target/1-15-jvm-3 core/target/1-15-js-3 joda/target/1-14-jvm-2.12 core/target/1-16-js-2.12 core/target/1-15-native-3 core/target/1-16-jvm-2.13 joda/target/1-16-jvm-2.12 joda/target/1-15-jvm-2.12 core/target/1-16-js-2.13 core/target/1-16-jvm-2.12 core/target/1-14-jvm-2.12 core/target/1-14-jvm-2.13 core/target/1-15-native-2.13 project/target
 
       - name: Upload target directories
         uses: actions/upload-artifact@v2

diff --git a/README.md b/README.md
@@ -26,19 +26,21 @@ under `"com.rallyhealth"`
 **NOTE** Version 2.x and above **requires** JDK >=8 and Scala >=2.11 as this
 library expects the java.time standard library module.
 
+**NOTE** Version 2.11.x and above **requires** Scala >=2.12
+
 **NOTE** As of `scalacheck-ops` >=2.0, the version of scalacheck is always
 included in the artifact name. Prior to this change, `scalacheck-ops` with
 no version suffix would pull in ScalaCheck version 1.12.6.
 
 |    Artifact Name    | Version Limit  | ScalaCheck | Supported JDK |  Supported Scala   | Supported Scala.js | Supported Native |
 |:-------------------:| :------------: |:----------:| :-----------: |:------------------:|:------------------:| :--------------: |
-| scalacheck-ops_1-16 | x >= 2.5.2     |   1.16.0   | 8             |   2.12, 2.13, 3    |         1          | 0.4              |
-| scalacheck-ops_1-15 | x >= 2.5.2     |   1.15.4   | 8             |   2.12, 2.13, 3    |         1          | 0.4              |
-| scalacheck-ops_1-14 | x >= 2.0       |   1.14.3   | 8             | 2.11, 2.12, 2.13   |        N/A         | N/A              |
-| scalacheck-ops_1-13 | x >= 2.0       |   1.13.5   | 8             |     2.11, 2.12     |        N/A         | N/A              |
-| scalacheck-ops_1-13 | 1.5 <= x < 2.0 |   1.13.4   | 6 - 8         |    2.10 - 2.11     |        N/A         | N/A              |
-| scalacheck-ops_1-12 | x >= 2.0       |   1.12.6   | 8             |        2.11        |        N/A         | N/A              |
-|   scalacheck-ops    | x < 2.0        |   1.12.6   | 6 - 8         |    2.10 - 2.11     |        N/A         | N/A              |
+| scalacheck-ops_1-16 | x >= 2.5.2      |   1.16.0   | 8             |   2.12, 2.13, 3    |         1          | 0.4              |
+| scalacheck-ops_1-15 | x >= 2.5.2      |   1.15.4   | 8             |   2.12, 2.13, 3    |         1          | 0.4              |
+| scalacheck-ops_1-14 | x >= 2.0        |   1.14.3   | 8             | 2.11, 2.12, 2.13   |        N/A         | N/A              |
+| scalacheck-ops_1-13 | x >= 2.0        |   1.13.5   | 8             |     2.11, 2.12     |        N/A         | N/A              |
+| scalacheck-ops_1-13 | 1.5 <= x < 2.0  |   1.13.4   | 6 - 8         |    2.10 - 2.11     |        N/A         | N/A              |
+| scalacheck-ops_1-12 | 2.0 <= x < 2.11 |   1.12.6   | 8             |        2.11        |        N/A         | N/A              |
+|   scalacheck-ops    | x < 2.0         |   1.12.6   | 6 - 8         |    2.10 - 2.11     |        N/A         | N/A              |
 
 The same source code is compiled against specific versions of Scala and ScalaCheck.
 We use separate artifacts to avoid causing issues with transitive dependencies on

diff --git a/build.sbt b/build.sbt
@@ -75,9 +75,6 @@ def commonSettings(subProject: Option[String]): Seq[Setting[_]] = {
 
     // show full stack traces in test failures
     Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-oF"),
-
-    // Disable coverage for Scala 2.11 -- sbt-scoverage no longer supports it
-    coverageEnabled := (if (scalaBinaryVersion.value == "2.11") false else coverageEnabled.value)
   )
 }
 
@@ -98,21 +95,12 @@ lazy val `core` = projectMatrix
       newtype, // Test-only
       ScalaCheckAxis.current.value.scalaTest // Test-only
     ) ++ (scalaVersion.value match {
-      case CrossVersion.PartialVersion("2", "11" | "12", _*) =>
-        Seq(
-          compilerPlugin(("org.scalamacros" % "paradise" % "2.1.1").cross(CrossVersion.full))
-        )
+      case CrossVersion.PartialVersion("2", "12", _*) => Seq(
+        compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full)
+      )
       case _ => Nil
     })
   )
-  .customRow(
-    scalaVersions = ScalaCheckAxis.v1_12.scalaVersions,
-    axisValues = Seq(ScalaCheckAxis.v1_12, VirtualAxis.jvm),
-    settings = Seq(
-      Compile / sourceDirectory := (file("core_1-12") / "src" / "main").getAbsoluteFile,
-      Test / sourceDirectory := (file("core_1-12") / "src" / "test").getAbsoluteFile
-    )
-  )
   .customRow(
     scalaVersions = ScalaCheckAxis.v1_13.scalaVersions,
     axisValues = Seq(ScalaCheckAxis.v1_13, VirtualAxis.jvm),
@@ -187,11 +175,6 @@ lazy val `joda` = projectMatrix
     // don't include dependencies that come from scalacheck-ops core project
     libraryDependencies += jodaTime
   )
-  .customRow(
-    scalaVersions = ScalaCheckAxis.v1_12.scalaVersions,
-    axisValues = Seq(ScalaCheckAxis.v1_12, VirtualAxis.jvm),
-    settings = Nil
-  )
   .customRow(
     scalaVersions = ScalaCheckAxis.v1_13.scalaVersions,
     axisValues = Seq(ScalaCheckAxis.v1_13, VirtualAxis.jvm),

diff --git a/core_1-12/src/main/scala/org/scalacheck/ops/ArbitraryAsGen.scala b/core_1-12/src/main/scala/org/scalacheck/ops/ArbitraryAsGen.scala
diff --git a/core_1-12/src/main/scala/org/scalacheck/ops/Exceptions.scala b/core_1-12/src/main/scala/org/scalacheck/ops/Exceptions.scala
diff --git a/core_1-12/src/main/scala/org/scalacheck/ops/GenOps.scala b/core_1-12/src/main/scala/org/scalacheck/ops/GenOps.scala
diff --git a/core_1-12/src/main/scala/org/scalacheck/ops/GenOrThrow.scala b/core_1-12/src/main/scala/org/scalacheck/ops/GenOrThrow.scala
diff --git a/core_1-12/src/main/scala/org/scalacheck/ops/ScalaCheckImplicits.scala b/core_1-12/src/main/scala/org/scalacheck/ops/ScalaCheckImplicits.scala