Merge pull request #387 from xuwei-k/examples

update examples. add travis test
typelevel · Apr 21, 2018 · 3eee567 · 3eee567
2 parents 61733e0 + a8b0e4e
commit 3eee567
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -39,6 +39,10 @@ matrix:
         - curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x
       sudo: required
       env: PLATFORM=native SBT_PARALLEL=true  WORKERS=1 DEPLOY=true
+    - env: EXAMPLES
+      script:
+      - cd examples
+      - for d in */ ; do cd "$d" && sbt test:compile && cd ../ ; done
   exclude:
     - scala: 2.10.7
       env: PLATFORM=js  SBT_PARALLEL=true  WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M3
diff --git a/examples/commands-leveldb/build.sbt b/examples/commands-leveldb/build.sbt
@@ -1,9 +1,9 @@
 name := "commands-leveldb"
 
-scalaVersion := "2.11.5"
+scalaVersion := "2.12.4"
 
 libraryDependencies ++= Seq(
-  "org.scalacheck" %% "scalacheck" % "1.12.2",
+  "org.scalacheck" %% "scalacheck" % "1.13.5",
   "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8"
 //  "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.7"
 //  "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.6.1"

diff --git a/examples/commands-nix/build.sbt b/examples/commands-nix/build.sbt
@@ -1,9 +1,9 @@
 name := "commands-nix"
 
-scalaVersion := "2.11.5"
+scalaVersion := "2.12.4"
 
 libraryDependencies ++= Seq(
-  "org.scalacheck" %% "scalacheck" % "1.12.2",
+  "org.scalacheck" %% "scalacheck" % "1.13.5",
   "net.java.dev.jna" % "jna" % "4.0.0"
 )
 

diff --git a/examples/commands-nix/src/test/scala/CommandsNix.scala b/examples/commands-nix/src/test/scala/CommandsNix.scala
@@ -140,7 +140,7 @@ object MachineSpec extends Commands {
     idGen = Gen.listOfN(8, Gen.alphaLowerChar).map(_.mkString)
     ids <- Gen.listOfN(machineCount, idGen)
     subnet <- genSubnet
-    machines <- Gen.sequence[List,Machine](ids.map(genMachine(_, subnet)))
+    machines <- Gen.sequence[List[Machine], Machine](ids.map(genMachine(_, subnet)))
   } yield machines
 
   def genPingOffline(state: State): Gen[Ping] = for {

diff --git a/examples/commands-redis/build.sbt b/examples/commands-redis/build.sbt
@@ -1,9 +1,9 @@
 name := "commands-redis"
 
-scalaVersion := "2.11.5"
+scalaVersion := "2.12.4"
 
 libraryDependencies ++= Seq(
-  "org.scalacheck" %% "scalacheck" % "1.12.2",
+  "org.scalacheck" %% "scalacheck" % "1.13.5",
   "org.slf4j" % "slf4j-simple" % "1.7.7",
-  "net.debasishg" %% "redisclient" % "2.13"
+  "net.debasishg" %% "redisclient" % "3.4"
 )
diff --git a/examples/simple-sbt/build.sbt b/examples/simple-sbt/build.sbt
@@ -1,7 +1,7 @@
 name := "scalacheck-demo"
 
-scalaVersion := "2.11.5"
+scalaVersion := "2.12.4"
 
-libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.12.2" % "test"
+libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.13.5" % "test"
 
 testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-maxSize", "5", "-minSuccessfulTests", "33", "-workers", "1", "-verbosity", "1")