Update to latest rickynils/master

.gitignore

@@ -18,3 +18,6 @@ target
 
 /examples/simple-sbt/project/
 /examples/simple-sbt/target/
+
+# Intellij
+.idea

.travis.yml

@@ -1,4 +1,5 @@
 language: scala
+dist: trusty
 script: ./tools/travis-script.sh
 after_success: ./tools/travis-deploy.sh
 branches:
@@ -14,8 +15,9 @@ notifications:
 
 scala:
   - 2.10.6
-  - 2.11.8
-  - 2.12.0
+  - 2.11.11
+  - 2.12.3
+  - 2.13.0-M2
 jdk:
   - oraclejdk8
 env:
@@ -27,4 +29,13 @@ env:
     - PLATFORM=jvm SBT_PARALLEL=true  WORKERS=4 DEPLOY=false
     - PLATFORM=jvm SBT_PARALLEL=false WORKERS=4 DEPLOY=false
     - PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true
+    - PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M1
 sudo: false
+
+matrix:
+  include:
+    - scala: 2.11.11
+      before_script:
+        - curl https://raw.githubusercontent.com/scala-native/scala-native/21539aa97947f767afcd85b5c2fb3c0262b2d301/bin/travis_setup.sh | bash -x
+      sudo: required
+      env: PLATFORM=native SBT_PARALLEL=true  WORKERS=1 DEPLOY=true

build.sbt

@@ -10,8 +10,8 @@ lazy val isRelease = false
 lazy val travisCommit = Option(System.getenv().get("TRAVIS_COMMIT"))
 
 lazy val scalaVersionSettings = Seq(
-  scalaVersion := "2.12.1",
-  crossScalaVersions := Seq("2.10.6", "2.11.8", scalaVersion.value)
+  scalaVersion := "2.12.3",
+  crossScalaVersions := Seq("2.10.6", "2.11.11", "2.13.0-M2", scalaVersion.value)
 )
 
 lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
@@ -56,7 +56,6 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
     "-feature",
     "-unchecked",
     "-Xfatal-warnings",
-    "-Xlint",
     "-Xfuture",
     "-Yno-adapted-args",
     "-Ywarn-dead-code",
@@ -65,8 +64,9 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
     "-Ywarn-nullary-unit",
     "-Ywarn-numeric-widen") ++ {
     scalaBinaryVersion.value match {
-      case "2.10" => Nil
-      case _ => Seq("-Ywarn-infer-any", "-Ywarn-unused-import")
+      case "2.10" => Seq("-Xlint")
+      case "2.11" => Seq("-Xlint", "-Ywarn-infer-any", "-Ywarn-unused-import")
+      case _      => Seq("-Xlint:-unused", "-Ywarn-infer-any", "-Ywarn-unused:imports,-patvars,-implicits,-locals,-privates,-params")
     }
   },
 
@@ -129,3 +129,14 @@ lazy val jvm = project.in(file("jvm"))
   .settings(
     libraryDependencies += "org.scala-sbt" %  "test-interface" % "1.0"
   )
+
+lazy val native = project.in(file("native"))
+  .settings(sharedSettings: _*)
+  .settings(
+    doc in Compile := (doc in Compile in jvm).value,
+    scalaVersion := "2.11.11",
+    libraryDependencies ++= Seq(
+      "org.scala-native" %% "test-interface_native0.3" % "0.3.1"
+    )
+  )
+  .enablePlugins(ScalaNativePlugin)

js/src/main/scala/org/scalacheck/Platform.scala

@@ -24,10 +24,8 @@ private[scalacheck] object Platform {
   def loadModule(name: String, loader: ClassLoader): AnyRef =
     org.scalajs.testinterface.TestUtils.loadModule(name, loader)
 
-  def newInstance(name: String, loader: ClassLoader)(args: Seq[AnyRef]): AnyRef =
-    org.scalajs.testinterface.TestUtils.newInstance(name, loader)(args)
+  def newInstance(name: String, loader: ClassLoader, paramTypes: Seq[Class[_]])(args: Seq[AnyRef]): AnyRef =
+    org.scalajs.testinterface.TestUtils.newInstance(name, loader, paramTypes)(args)
 
-  type JSExportDescendentObjects = scala.scalajs.js.annotation.JSExportDescendentObjects
-
-  type JSExportDescendentClasses = scala.scalajs.js.annotation.JSExportDescendentClasses
+  type EnableReflectiveInstantiation = scala.scalajs.reflect.annotation.EnableReflectiveInstantiation
 }

jvm/src/main/scala/org/scalacheck/Platform.scala

@@ -61,20 +61,12 @@ private[scalacheck] object Platform {
     }
   }
 
-  def newInstance(name: String, loader: ClassLoader)(args: Seq[AnyRef]): AnyRef =
+  def newInstance(name: String, loader: ClassLoader, paramTypes: Seq[Class[_]])(args: Seq[AnyRef]): AnyRef =
     if(!args.isEmpty) ???
     else Class.forName(name, true, loader).newInstance.asInstanceOf[AnyRef]
 
   def loadModule(name: String, loader: ClassLoader): AnyRef =
     Class.forName(name + "$", true, loader).getField("MODULE$").get(null)
 
-  class JSExportDescendentObjects(ignoreInvalidDescendants: Boolean)
-      extends scala.annotation.Annotation {
-    def this() = this(false)
-  }
-
-  class JSExportDescendentClasses(ignoreInvalidDescendants: Boolean)
-      extends scala.annotation.Annotation {
-    def this() = this(false)
-  }
+  class EnableReflectiveInstantiation extends scala.annotation.Annotation
 }

jvm/src/test/scala/org/scalacheck/GenSpecification.scala

@@ -200,6 +200,18 @@ object GenSpecification extends Properties("Gen") {
     }
   }
 
+  property("distributed pick") = {
+    val lst = (0 to 7).toIterable
+    val n = 2
+    forAll(pick(n, lst)) { xs: Seq[Int] =>
+      xs.map { x: Int =>
+        Prop.collect(x) {
+          xs.size == n
+        }
+      } reduce (_ && _)
+    }
+  }
+
   property("numChar") = forAll(numChar)(_.isDigit)
 
   property("calendar") = forAll(calendar) { cal =>
@@ -313,11 +325,37 @@ object GenSpecification extends Properties("Gen") {
 
   property("some") = forAll { n: Int =>
     forAll(some(n)) {
-      case Some(m) if m == n => true
+      case Some(m) => m == n
       case _ => false
     }
   }
 
+  property("tailRecM") = forAll { (init: Int, seeds: List[Seed]) =>
+    val g: ((Int, Int)) => Gen[Either[(Int, Int), Int]] =
+      {
+        case (c, x) if c <= 0 =>
+          Gen.const(Right(x))
+        case (c, x) =>
+          val g = Gen.choose(Int.MinValue, x)
+          g.map { i => Left(((c - 1), i)) }
+      }
+
+    val g1 = Gen.tailRecM((10, init))(g)
+    def g2(x: (Int, Int)): Gen[Int] = g(x).flatMap {
+      case Left(y) => g2(y)
+      case Right(x) => Gen.const(x)
+    }
+
+    val finalG2 = g2((10, init))
+
+
+    val params = Gen.Parameters.default
+
+    seeds.forall { seed =>
+      g1.pureApply(params, seed) == finalG2.pureApply(params, seed)
+    }
+  }
+
   property("uuid version 4") = forAll(uuid) { _.version == 4 }
 
   property("uuid unique") = forAll(uuid, uuid) {
@@ -472,7 +510,7 @@ object GenSpecification extends Properties("Gen") {
   }
 
   property("arbitrary[Boolean] is deterministic") =
-    testDeterministicGen(arbitrary[Long])
+    testDeterministicGen(arbitrary[Boolean])
 
   property("arbitrary[Long] is deterministic") =
     testDeterministicGen(arbitrary[Long])

jvm/src/test/scala/org/scalacheck/SerializabilitySpecification.scala

@@ -72,20 +72,24 @@ object SerializabilitySpecification extends Properties("Serializability") {
   serializableArbitrary[Int]("Int")
   serializableArbitrary[Double]("Double")
   serializableArbitrary[Boolean]("Boolean")
+  serializableArbitrary[Int => Int]("Int => Int")
 
   serializableGen("identifier", Gen.identifier)
   serializableGen("oneOf", Gen.oneOf(true, false))
   serializableGen("choose", Gen.choose(1, 10))
+  serializableGen("function1", Gen.function1[Int, Int](Gen.choose(1, 10)))
 
   serializableCogen[String]("String")
   serializableCogen[Int]("Int")
   serializableCogen[Double]("Double")
   serializableCogen[Boolean]("Boolean")
+  serializableCogen[Int => Int]("Int => Int")
 
   serializableShrink[String]("String")
   serializableShrink[Int]("Int")
   serializableShrink[Double]("Double")
   serializableShrink[Boolean]("Boolean")
+  serializableShrink[Int => Int]("Int => Int")
 
   property("Seed serializability") = {
     assert(serializable(rng.Seed(1L)))

native/src/main/scala/org/scalacheck/Platform.scala

@@ -0,0 +1,36 @@
+/*-------------------------------------------------------------------------*\
+**  ScalaCheck                                                             **
+**  Copyright (c) 2007-2017 Rickard Nilsson. All rights reserved.          **
+**  http://www.scalacheck.org                                              **
+**                                                                         **
+**  This software is released under the terms of the Revised BSD License.  **
+**  There is NO WARRANTY. See the file LICENSE for the full text.          **
+\*------------------------------------------------------------------------ */
+
+package org.scalacheck
+
+import Test._
+
+import scala.scalanative.testinterface.PreloadedClassLoader
+
+private[scalacheck] object Platform {
+
+  def runWorkers(
+    params: Parameters,
+    workerFun: Int => Result,
+    stop: () => Unit
+  ): Result = {
+    workerFun(0)
+  }
+
+  def loadModule(name: String, loader: ClassLoader): AnyRef =
+    loader.asInstanceOf[PreloadedClassLoader].loadPreloaded(name)
+
+  def newInstance(name: String, loader: ClassLoader, paramTypes: Seq[Class[_]])(args: Seq[AnyRef]): AnyRef =
+    org.scalajs.testinterface.TestUtils.newInstance(name, loader, paramTypes)(args)
+
+  // We don't need those annotation in Native, and they have been deprecated.
+  // We use `String` instead of the definition in Native because `-Xfatal-warnings`
+  // is set.
+  type EnableReflectiveInstantiation = String
+}

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=0.13.15

project/plugin.sbt

@@ -2,6 +2,11 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.14")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
+val scalaJSVersion =
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.19")
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
+
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.3")
 
 scalacOptions += "-deprecation"

src/main/scala/org/scalacheck/Arbitrary.scala

@@ -172,6 +172,10 @@ private[scalacheck] sealed trait ArbitraryLowPriority {
   implicit lazy val arbError: Arbitrary[Error] =
     Arbitrary(const(new Error))
 
+  /** Arbitrary instance of UUID */
+  implicit lazy val arbUuid: Arbitrary[java.util.UUID] =
+    Arbitrary(Gen.uuid)
+
   /** Arbitrary BigInt */
   implicit lazy val arbBigInt: Arbitrary[BigInt] = {
     val long: Gen[Long] =