-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add them to the PR build * Some minor build tweaks
- Loading branch information
Showing
3 changed files
with
16 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 8 additions & 13 deletions
21
alleycats-tests/js/src/test/scala/alleycats/tests/TestSettings.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,12 @@ | ||
package alleycats.tests | ||
|
||
import org.scalactic.anyvals.{PosInt, PosZDouble, PosZInt} | ||
import org.scalatest.matchers.should.Matchers | ||
import org.scalatest.prop.Configuration | ||
import org.scalacheck.Test | ||
|
||
trait TestSettings extends Configuration with Matchers { | ||
|
||
lazy val checkConfiguration: PropertyCheckConfiguration = | ||
PropertyCheckConfiguration( | ||
minSuccessful = PosInt(5), | ||
maxDiscardedFactor = PosZDouble(50.0), | ||
minSize = PosZInt(0), | ||
sizeRange = PosZInt(5), | ||
workers = PosInt(1) | ||
) | ||
trait TestSettings { | ||
lazy val checkConfiguration: Test.Parameters = | ||
Test.Parameters.default | ||
.withMinSuccessfulTests(5) | ||
.withMaxDiscardRatio(50.0f) | ||
.withMinSize(0) | ||
.withWorkers(1) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ scalafixDependencies in ThisBuild += "org.typelevel" %% "simulacrum-scalafix" % | |
|
||
val isTravisBuild = settingKey[Boolean]("Flag indicating whether the current build is running under Travis") | ||
val crossScalaVersionsFromTravis = settingKey[Seq[String]]("Scala versions set in .travis.yml as scala_version_XXX") | ||
isTravisBuild in Global := sys.env.get("TRAVIS").isDefined | ||
isTravisBuild in Global := sys.env.contains("TRAVIS") | ||
|
||
val scalaCheckVersion = "1.14.3" | ||
|
||
|
@@ -249,19 +249,18 @@ def mimaPrevious(moduleName: String, scalaVer: String, ver: String, includeCats1 | |
else if (currentMinVersion != minor) List(0) | ||
else Range(0, patch - 1).inclusive.toList | ||
|
||
val versions = for { | ||
for { | ||
maj <- majorVersions | ||
min <- minorVersions | ||
pat <- patchVersions(min) | ||
} yield (maj, min, pat) | ||
versions.toList | ||
} | ||
|
||
val mimaVersions: List[String] = { | ||
Version(ver) match { | ||
case Some(Version(major, Seq(minor, patch), _)) => | ||
semverBinCompatVersions(major.toInt, minor.toInt, patch.toInt) | ||
.map { case (maj, min, pat) => s"${maj}.${min}.${pat}" } | ||
.map { case (maj, min, pat) => s"$maj.$min.$pat" } | ||
case _ => | ||
List.empty[String] | ||
} | ||
|
@@ -679,7 +678,7 @@ lazy val publishSettings = Seq( | |
scmInfo := Some(ScmInfo(url("https://github.com/typelevel/cats"), "scm:git:[email protected]:typelevel/cats.git")), | ||
autoAPIMappings := true, | ||
apiURL := Some(url("http://typelevel.org/cats/api/")), | ||
pomExtra := ( | ||
pomExtra := | ||
<developers> | ||
<developer> | ||
<id>ceedubs</id> | ||
|
@@ -757,7 +756,6 @@ lazy val publishSettings = Seq( | |
<url>https://github.com/kailuowang/</url> | ||
</developer> | ||
</developers> | ||
) | ||
) ++ credentialSettings ++ sharedPublishSettings ++ sharedReleaseProcess | ||
|
||
// Scalafmt | ||
|
@@ -776,6 +774,7 @@ addCommandAlias("validateJVM", ";fmtCheck;buildJVM;bench/test;validateBC;makeMic | |
addCommandAlias("validateJS", ";catsJS/compile;testsJS/test;js/test") | ||
addCommandAlias("validateKernelJS", "kernelLawsJS/test") | ||
addCommandAlias("validateFreeJS", "freeJS/test") //separated due to memory constraint on travis | ||
addCommandAlias("validateAlleycatsJS", "alleycatsTestsJS/test") | ||
addCommandAlias("validateDotty", ";++0.24.0!;alleycatsLawsJVM/compile") | ||
addCommandAlias("validate", ";clean;validateJS;validateKernelJS;validateFreeJS;validateJVM;validateDotty") | ||
|
||
|