From 41dca6b20ba5c4fd9471f50cb359b80d816cca28 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 6 Nov 2020 17:37:45 -0800 Subject: [PATCH 1/2] move to ScalaCheck 1.15 --- proj/scalacheck.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proj/scalacheck.conf b/proj/scalacheck.conf index ead8ded55..93d2020e1 100644 --- a/proj/scalacheck.conf +++ b/proj/scalacheck.conf @@ -1,8 +1,8 @@ -// https://github.com/typelevel/scalacheck.git#1.14.x +// https://github.com/typelevel/scalacheck.git#master vars.proj.scalacheck: ${vars.base} { name: "scalacheck" - uri: "https://github.com/typelevel/scalacheck.git#c63b932c0a1fedfea7a6c494f3870a301a48e3fe" + uri: "https://github.com/typelevel/scalacheck.git#567ad167533b3f1395250ffd7128d9dc47bab074" extra.projects: ["jvm"] // no Scala.js please } From f321a4c47b00f4f75cc30467db7f4386305ba26a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Sat, 7 Nov 2020 06:23:39 -0800 Subject: [PATCH 2/2] wip --- proj/breeze.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/proj/breeze.conf b/proj/breeze.conf index 585d23772..8647c719e 100644 --- a/proj/breeze.conf +++ b/proj/breeze.conf @@ -1,8 +1,11 @@ -// https://github.com/scalanlp/breeze.git#master +// https://github.com/SethTisue/breeze.git#scalacheck-1.15 + +// temporarily forked (November 2020) for ScalaCheck 1.15 upgrade, pending merge of +// https://github.com/scalanlp/breeze/pull/795 vars.proj.breeze: ${vars.base} { name: "breeze" - uri: "https://github.com/scalanlp/breeze.git#40b99f6a6fbd8454ff8874d6ed34e860f49b6662" + uri: "https://github.com/SethTisue/breeze.git#6247c10daefc43bacc9131a218c42d206956027b" extra.exclude: ["benchmark"] extra.commands: ${vars.default-commands} [