Merge pull request #404 from Philippus/some-updates

Update scala to 2.12.6 and some more

Author: rickynils

.travis.yml

@@ -7,6 +7,7 @@ branches:
     - master
     - 1.12.x
     - 1.13.x
+    - 1.14.x
 notifications:
   email:
     - adriaan.moors@typesafe.com
@@ -15,7 +16,7 @@ notifications:
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.5
+  - 2.12.6
   - 2.13.0-M3
 jdk:
   - oraclejdk8

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2017, Rickard Nilsson
+Copyright (c) 2007-2018, Rickard Nilsson
 
 All rights reserved.
 

README.markdown

@@ -2,7 +2,7 @@
 
 [![Join the chat at https://gitter.im/scalacheck/Lobby](https://badges.gitter.im/scalacheck/Lobby.svg)](https://gitter.im/scalacheck/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[![Build Status](https://secure.travis-ci.org/rickynils/scalacheck.png?branch=master)](http://travis-ci.org/rickynils/scalacheck)
+[![Build Status](https://travis-ci.org/rickynils/scalacheck.svg?branch=master)](http://travis-ci.org/rickynils/scalacheck)
 
 ScalaCheck is a library written in [Scala](http://www.scala-lang.org/) and 
 used for automated property-based testing of Scala or Java programs.

build.sbt

@@ -9,7 +9,7 @@ lazy val isRelease = false
 lazy val travisCommit = Option(System.getenv().get("TRAVIS_COMMIT"))
 
 lazy val scalaVersionSettings = Seq(
-  scalaVersion := "2.12.5",
+  scalaVersion := "2.12.6",
   crossScalaVersions := Seq("2.10.7", "2.11.12", "2.13.0-M3", scalaVersion.value)
 )
 

examples/commands-leveldb/build.sbt

@@ -1,9 +1,9 @@
 name := "commands-leveldb"
 
-scalaVersion := "2.12.5"
+scalaVersion := "2.12.6"
 
 libraryDependencies ++= Seq(
-  "org.scalacheck" %% "scalacheck" % "1.13.5",
+  "org.scalacheck" %% "scalacheck" % "1.14.0",
   "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8"
 //  "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.7"
 //  "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.6.1"

examples/commands-nix/build.sbt

@@ -1,10 +1,10 @@
 name := "commands-nix"
 
-scalaVersion := "2.12.5"
+scalaVersion := "2.12.6"
 
 libraryDependencies ++= Seq(
-  "org.scalacheck" %% "scalacheck" % "1.13.5",
-  "net.java.dev.jna" % "jna" % "4.0.0"
+  "org.scalacheck" %% "scalacheck" % "1.14.0",
+  "net.java.dev.jna" % "jna" % "4.5.1"
 )
 
 javacOptions ++= Seq("-Xmx1024M")

examples/commands-redis/build.sbt

@@ -1,9 +1,9 @@
 name := "commands-redis"
 
-scalaVersion := "2.12.5"
+scalaVersion := "2.12.6"
 
 libraryDependencies ++= Seq(
-  "org.scalacheck" %% "scalacheck" % "1.13.5",
-  "org.slf4j" % "slf4j-simple" % "1.7.7",
-  "net.debasishg" %% "redisclient" % "3.4"
+  "org.scalacheck" %% "scalacheck" % "1.14.0",
+  "org.slf4j" % "slf4j-simple" % "1.7.25",
+  "net.debasishg" %% "redisclient" % "3.6"
 )

examples/scalajs/README.md

@@ -24,7 +24,7 @@ The following is what you need to add to your `build.sbt` file to make the
 ScalaCheck test runner work:
 
 ```
-libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.13.5" % "test"
+libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.14.0" % "test"
 ```
 
 ## Limitations

examples/scalajs/build.sbt

@@ -4,8 +4,8 @@ name := "ScalaCheck-scalajs-example"
 
 version := "0.1-SNAPSHOT"
 
-scalaVersion := "2.12.4"
+scalaVersion := "2.12.6"
 
 javacOptions += "-Xmx2048M"
 
-libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.13.5" % "test"
+libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.14.0" % "test"

examples/scalajs/project/build.properties

@@ -1 +1 @@
-sbt.version=1.1.1
+sbt.version=1.1.4