From eb9cc891f958c54bc6d61e21ffc61e63f6be7f58 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Wed, 6 Jul 2016 23:07:33 -0700 Subject: [PATCH 01/17] workaround for valsiginfer limitation in fields refactor --- common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.conf b/common.conf index 2e0aacd53..0bf346999 100644 --- a/common.conf +++ b/common.conf @@ -64,7 +64,7 @@ vars: { // "release-0.7" is a stable branch, used to cut 0.7 against new Scala milestones at this time scala-stm-ref : "nbronson/scala-stm.git#release-0.7" scalacheck-ref : "rickynils/scalacheck.git#1.11.6" - scalatest-ref : "scalatest/scalatest.git#2.2.3-and-greater" + scalatest-ref : "adriaanm/scalatest.git#2.2.3-and-greater-cobu" // fixed sha/tag (a compromise), the sha points at master that supports Scala 2.11 spire-ref : "non/spire.git#3d2a41e91a1f6946fac63660f6157d4a6e4a281d" # before adding the scoverage 1.3.5 dependency From 51de02fb759522f6e2ca4f377070ee3d42aa761b Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 7 Jul 2016 09:00:13 -0700 Subject: [PATCH 02/17] skip tests for macro-paradise, patch for scala-swing --- common.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common.conf b/common.conf index 0bf346999..e34c15af3 100644 --- a/common.conf +++ b/common.conf @@ -85,7 +85,7 @@ vars: { scala-partest-ref : "scala/scala-partest.git" scala-partest-interface-ref : "scala/scala-partest-interface.git" scala-xml-ref : "scala/scala-xml.git" - scala-swing-ref : "scala/scala-swing.git#2.0.x" + scala-swing-ref : "adriaanm/scala-swing.git#2.0.x" scala-records-ref : "scala-records/scala-records.git" slick-ref : "slick/slick.git" twitter-util-ref : "adriaanm/util.git#develop" @@ -481,6 +481,7 @@ build += { ${vars.base} { name: "macro-paradise", uri: "http://github.com/"${vars.macro-paradise-ref} + extra.run-tests: false // TODO enable tests } ${vars.base} { From 6e705ca216756e912bf78361b0382f2df6a9cfb0 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 7 Jul 2016 09:59:55 -0700 Subject: [PATCH 03/17] verify https://github.com/scala-js/scala-js/pull/2541 --- common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.conf b/common.conf index e34c15af3..cb800e2ac 100644 --- a/common.conf +++ b/common.conf @@ -112,7 +112,7 @@ vars: { scodec-bits-ref : "adriaanm/scodec-bits.git#dbuild-sam" discipline-ref : "typelevel/discipline.git#v0.2" scala-2-12-junit-mixin-plugin-ref : "scala-js/scala-2.12-junit-mixin-plugin.git" - scala-js-ref : "scala-js/scala-js.git" + scala-js-ref : "adriaanm/scala-js.git#2.12-fields-compat" scalamock-ref : "paulbutcher/scalamock.git" scalariform-ref : "daniel-trinh/scalariform.git" From 4b4a951277d3c620cd82cfd5f879c8a657d29b35 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 21 Jul 2016 08:35:54 -0700 Subject: [PATCH 04/17] oh dbuild why you so picky --- common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.conf b/common.conf index cb800e2ac..c3cf5a44f 100644 --- a/common.conf +++ b/common.conf @@ -421,7 +421,7 @@ build += { } ${vars.base} { - name: "scala-2.12-junit-mixin-plugin", + name: "scala-2-12-junit-mixin-plugin", uri: "http://github.com/"${vars.scala-2-12-junit-mixin-plugin-ref} } From 5997bd7da24790b184558d39f48f4fc97e3799cc Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 21 Jul 2016 15:12:34 -0700 Subject: [PATCH 05/17] use slick/slick#1573 fix for headOption --- common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.conf b/common.conf index c3cf5a44f..c9c42bea1 100644 --- a/common.conf +++ b/common.conf @@ -87,7 +87,7 @@ vars: { scala-xml-ref : "scala/scala-xml.git" scala-swing-ref : "adriaanm/scala-swing.git#2.0.x" scala-records-ref : "scala-records/scala-records.git" - slick-ref : "slick/slick.git" + slick-ref : "ChristopherDavenport/slick.git#issue/1572" twitter-util-ref : "adriaanm/util.git#develop" jawn-ref : "non/jawn.git" mima-ref : "lrytz/migration-manager.git#2.12-compat" From d7a97526237d48a14de56319a6a5a7f2bc9257cb Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 21 Jul 2016 16:46:56 -0700 Subject: [PATCH 06/17] fork paradise --- common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.conf b/common.conf index c9c42bea1..677c8bc31 100644 --- a/common.conf +++ b/common.conf @@ -95,7 +95,7 @@ vars: { acyclic-ref : "lihaoyi/acyclic.git" sourcecode-ref : "lihaoyi/sourcecode.git" fastparse-ref : "lihaoyi/fastparse.git" - macro-paradise-ref : "scalamacros/paradise.git#2.12.x" + macro-paradise-ref : "adriaanm/paradise.git#2.12.x-cobu" macro-compat-ref : "milessabin/macro-compat.git" specs2-3-ref : "adriaanm/specs2.git#community-build-3.6" // "etorreborre/specs2.git#SPECS2-3.6.2" From eb158ff1db98c7415c13404db7decd24e2b05528 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 21 Jul 2016 17:25:55 -0700 Subject: [PATCH 07/17] workaround NPE in scalajavadoc on akka --- common.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common.conf b/common.conf index 677c8bc31..d87bbc02c 100644 --- a/common.conf +++ b/common.conf @@ -349,7 +349,10 @@ build += { // since it's just benchmarks and we'd have to add another resolver // to get the JMH dependency. - ST 8/17/15 projects: ["akka-actor", "akka-testkit", "akka-slf4j", "akka-kernel", "akka-actor-tests", "akka-typed-experimental", "akka-remote", "akka-multi-node-testkit", "akka-remote-tests", "akka-cluster", "akka-distributed-data-experimental", "akka-cluster-metrics", "akka-cluster-tools", "akka-camel", "akka-persistence", "akka-cluster-sharding", "akka-persistence-tck", "akka-contrib", "akka-osgi"] - run-tests: false // TODO re-enable tests (they've long been disabled in 2.11 as well) - ST 8/27/15 + run-tests: false // TODO re-enable tests (they've long been disabled in 2.11 as well) - ST 8/27/15 + commands: ${vars.default-commands} [ // until NPE in scalajavadoc is fixed + "set every sources in doc in Compile := Nil" + ] } } From 0a29499f937d9f440a9ac89349fd565659c79e99 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 21 Jul 2016 18:10:34 -0700 Subject: [PATCH 08/17] enable akka docs to test javadoc patch --- common.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common.conf b/common.conf index d87bbc02c..10bcf0620 100644 --- a/common.conf +++ b/common.conf @@ -350,9 +350,9 @@ build += { // to get the JMH dependency. - ST 8/17/15 projects: ["akka-actor", "akka-testkit", "akka-slf4j", "akka-kernel", "akka-actor-tests", "akka-typed-experimental", "akka-remote", "akka-multi-node-testkit", "akka-remote-tests", "akka-cluster", "akka-distributed-data-experimental", "akka-cluster-metrics", "akka-cluster-tools", "akka-camel", "akka-persistence", "akka-cluster-sharding", "akka-persistence-tck", "akka-contrib", "akka-osgi"] run-tests: false // TODO re-enable tests (they've long been disabled in 2.11 as well) - ST 8/27/15 - commands: ${vars.default-commands} [ // until NPE in scalajavadoc is fixed - "set every sources in doc in Compile := Nil" - ] + // commands: ${vars.default-commands} [ // until NPE in scalajavadoc is fixed + // "set every sources in doc in Compile := Nil" + // ] } } From 04d344ff71304e063d20a38bf56e76d6a0967124 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Tue, 9 Aug 2016 17:08:15 -0700 Subject: [PATCH 09/17] back to upstream scala-js --- common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.conf b/common.conf index 10bcf0620..84252facf 100644 --- a/common.conf +++ b/common.conf @@ -112,7 +112,7 @@ vars: { scodec-bits-ref : "adriaanm/scodec-bits.git#dbuild-sam" discipline-ref : "typelevel/discipline.git#v0.2" scala-2-12-junit-mixin-plugin-ref : "scala-js/scala-2.12-junit-mixin-plugin.git" - scala-js-ref : "adriaanm/scala-js.git#2.12-fields-compat" + scala-js-ref : "scala-js/scala-js.git" scalamock-ref : "paulbutcher/scalamock.git" scalariform-ref : "daniel-trinh/scalariform.git" From a30e96e49c3efc794d603d591c7055b7c802f24e Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Tue, 9 Aug 2016 19:34:57 -0700 Subject: [PATCH 10/17] Disable akka javadocs for now --- common.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common.conf b/common.conf index 84252facf..3ff3c3c78 100644 --- a/common.conf +++ b/common.conf @@ -350,9 +350,9 @@ build += { // to get the JMH dependency. - ST 8/17/15 projects: ["akka-actor", "akka-testkit", "akka-slf4j", "akka-kernel", "akka-actor-tests", "akka-typed-experimental", "akka-remote", "akka-multi-node-testkit", "akka-remote-tests", "akka-cluster", "akka-distributed-data-experimental", "akka-cluster-metrics", "akka-cluster-tools", "akka-camel", "akka-persistence", "akka-cluster-sharding", "akka-persistence-tck", "akka-contrib", "akka-osgi"] run-tests: false // TODO re-enable tests (they've long been disabled in 2.11 as well) - ST 8/27/15 - // commands: ${vars.default-commands} [ // until NPE in scalajavadoc is fixed - // "set every sources in doc in Compile := Nil" - // ] + commands: ${vars.default-commands} [ // until NPE in scalajavadoc is fixed + "set every sources in doc in Compile := Nil" + ] } } From 89b98bbadcfbddd636c70b066e29c8036da84d74 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Tue, 9 Aug 2016 19:38:00 -0700 Subject: [PATCH 11/17] [shapeless] removeScalacOptions -Xfatal-warnings --- common.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common.conf b/common.conf index 3ff3c3c78..cbc06065b 100644 --- a/common.conf +++ b/common.conf @@ -246,9 +246,7 @@ build += { uri: "https://github.com/"${vars.shapeless-ref} extra.projects: ["coreJVM"] // optimizer related. Lukas may want to revisit before 2.12 final - extra.commands: ${vars.default-commands} [ - "set scalacOptions -= \"-Xfatal-warnings\"" - ] + extra.commands: ${vars.default-commands} [ "removeScalacOptions -Xfatal-warnings" ] extra.run-tests: false // TODO enable tests } From e118ff8e5b7f454e4a882063c0487cf5f3ec644b Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Wed, 10 Aug 2016 13:22:12 -0700 Subject: [PATCH 12/17] better way to suppress docs? old one seems to cause empty jars for akka-actor... also disable two unrelated failing builds to speed up testing --- common.conf | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/common.conf b/common.conf index cbc06065b..beb38a6d5 100644 --- a/common.conf +++ b/common.conf @@ -349,7 +349,7 @@ build += { projects: ["akka-actor", "akka-testkit", "akka-slf4j", "akka-kernel", "akka-actor-tests", "akka-typed-experimental", "akka-remote", "akka-multi-node-testkit", "akka-remote-tests", "akka-cluster", "akka-distributed-data-experimental", "akka-cluster-metrics", "akka-cluster-tools", "akka-camel", "akka-persistence", "akka-cluster-sharding", "akka-persistence-tck", "akka-contrib", "akka-osgi"] run-tests: false // TODO re-enable tests (they've long been disabled in 2.11 as well) - ST 8/27/15 commands: ${vars.default-commands} [ // until NPE in scalajavadoc is fixed - "set every sources in doc in Compile := Nil" + "set publishArtifact in (Compile, packageDoc) in ThisBuild := false" ] } } @@ -402,14 +402,14 @@ build += { extra.projects: ["sbt-testng-interface"] // just the interface, we don't need to build the plugin } - ${vars.base} { - name: "browse", - uri: "https://github.com/"${vars.browse-ref} - extra.commands: ${vars.default-commands} [ - "set libraryDependencies += \"org.scala-lang.modules\" %% \"scala-xml\" % \"1.0.0-RC6\"" - ] - extra.exclude: ["test", "testLink"] - } +// ${vars.base} { +// name: "browse", +// uri: "https://github.com/"${vars.browse-ref} +// extra.commands: ${vars.default-commands} [ +// "set libraryDependencies += \"org.scala-lang.modules\" %% \"scala-xml\" % \"1.0.0-RC6\"" +// ] +// extra.exclude: ["test", "testLink"] +// } ${vars.base} { name: sbinary @@ -550,14 +550,14 @@ build += { } // in this space because it depends on scoverage - ${vars.base} { - name: "twitter-util", - uri: "http://github.com/"${vars.twitter-util-ref} - // this isn't really necessary and would pull in a JMH dependency - extra.exclude: ["util-benchmark"] - // TODO tests pass in 2.11.x-jdk8, why not here? - extra.run-tests: false - } +// ${vars.base} { +// name: "twitter-util", +// uri: "http://github.com/"${vars.twitter-util-ref} +// // this isn't really necessary and would pull in a JMH dependency +// extra.exclude: ["util-benchmark"] +// // TODO tests pass in 2.11.x-jdk8, why not here? +// extra.run-tests: false +// } ]} From 18f339e0f965ea2ed4ee63e85aba3707dd8b9f55 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Wed, 10 Aug 2016 20:22:47 -0700 Subject: [PATCH 13/17] back to upstream macro-paradise (fork is needed only when testing fields) --- common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.conf b/common.conf index beb38a6d5..e67c93335 100644 --- a/common.conf +++ b/common.conf @@ -95,7 +95,7 @@ vars: { acyclic-ref : "lihaoyi/acyclic.git" sourcecode-ref : "lihaoyi/sourcecode.git" fastparse-ref : "lihaoyi/fastparse.git" - macro-paradise-ref : "adriaanm/paradise.git#2.12.x-cobu" + macro-paradise-ref : "scalamacros/paradise.git#2.12.x" macro-compat-ref : "milessabin/macro-compat.git" specs2-3-ref : "adriaanm/specs2.git#community-build-3.6" // "etorreborre/specs2.git#SPECS2-3.6.2" From 79aedaf3e7419d246e175c2c7fd4062906c780ae Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Sat, 13 Aug 2016 08:39:23 -0700 Subject: [PATCH 14/17] re-enable a few things --- common.conf | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/common.conf b/common.conf index e67c93335..aec3687bb 100644 --- a/common.conf +++ b/common.conf @@ -88,7 +88,7 @@ vars: { scala-swing-ref : "adriaanm/scala-swing.git#2.0.x" scala-records-ref : "scala-records/scala-records.git" slick-ref : "ChristopherDavenport/slick.git#issue/1572" - twitter-util-ref : "adriaanm/util.git#develop" + twitter-util-ref : "twitter/util.git#develop" jawn-ref : "non/jawn.git" mima-ref : "lrytz/migration-manager.git#2.12-compat" utest-ref : "lihaoyi/utest.git#0.4.3" @@ -348,9 +348,6 @@ build += { // to get the JMH dependency. - ST 8/17/15 projects: ["akka-actor", "akka-testkit", "akka-slf4j", "akka-kernel", "akka-actor-tests", "akka-typed-experimental", "akka-remote", "akka-multi-node-testkit", "akka-remote-tests", "akka-cluster", "akka-distributed-data-experimental", "akka-cluster-metrics", "akka-cluster-tools", "akka-camel", "akka-persistence", "akka-cluster-sharding", "akka-persistence-tck", "akka-contrib", "akka-osgi"] run-tests: false // TODO re-enable tests (they've long been disabled in 2.11 as well) - ST 8/27/15 - commands: ${vars.default-commands} [ // until NPE in scalajavadoc is fixed - "set publishArtifact in (Compile, packageDoc) in ThisBuild := false" - ] } } @@ -482,7 +479,7 @@ build += { ${vars.base} { name: "macro-paradise", uri: "http://github.com/"${vars.macro-paradise-ref} - extra.run-tests: false // TODO enable tests + extra.run-tests: true } ${vars.base} { @@ -550,14 +547,14 @@ build += { } // in this space because it depends on scoverage -// ${vars.base} { -// name: "twitter-util", -// uri: "http://github.com/"${vars.twitter-util-ref} -// // this isn't really necessary and would pull in a JMH dependency -// extra.exclude: ["util-benchmark"] -// // TODO tests pass in 2.11.x-jdk8, why not here? -// extra.run-tests: false -// } + ${vars.base} { + name: "twitter-util", + uri: "http://github.com/"${vars.twitter-util-ref} + // this isn't really necessary and would pull in a JMH dependency + extra.exclude: ["util-benchmark"] + // TODO tests pass in 2.11.x-jdk8, why not here? + extra.run-tests: true + } ]} From 68be85ad8ff6a8315750b0bd67814c42100e4d92 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Sat, 13 Aug 2016 16:35:08 -0700 Subject: [PATCH 15/17] RC1 prep --- common.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common.conf b/common.conf index aec3687bb..85b2d7660 100644 --- a/common.conf +++ b/common.conf @@ -87,15 +87,15 @@ vars: { scala-xml-ref : "scala/scala-xml.git" scala-swing-ref : "adriaanm/scala-swing.git#2.0.x" scala-records-ref : "scala-records/scala-records.git" - slick-ref : "ChristopherDavenport/slick.git#issue/1572" - twitter-util-ref : "twitter/util.git#develop" + slick-ref : "adriaanm/slick.git#master" + twitter-util-ref : "adriaanm/util.git#develop" jawn-ref : "non/jawn.git" mima-ref : "lrytz/migration-manager.git#2.12-compat" utest-ref : "lihaoyi/utest.git#0.4.3" acyclic-ref : "lihaoyi/acyclic.git" sourcecode-ref : "lihaoyi/sourcecode.git" fastparse-ref : "lihaoyi/fastparse.git" - macro-paradise-ref : "scalamacros/paradise.git#2.12.x" + macro-paradise-ref : "adriaanm/paradise.git#2.12.x-cobu" macro-compat-ref : "milessabin/macro-compat.git" specs2-3-ref : "adriaanm/specs2.git#community-build-3.6" // "etorreborre/specs2.git#SPECS2-3.6.2" @@ -112,7 +112,7 @@ vars: { scodec-bits-ref : "adriaanm/scodec-bits.git#dbuild-sam" discipline-ref : "typelevel/discipline.git#v0.2" scala-2-12-junit-mixin-plugin-ref : "scala-js/scala-2.12-junit-mixin-plugin.git" - scala-js-ref : "scala-js/scala-js.git" + scala-js-ref : "adriaanm/scala-js.git" scalamock-ref : "paulbutcher/scalamock.git" scalariform-ref : "daniel-trinh/scalariform.git" From 02d68eeb33935561b3e032a04b6972380e115517 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Sat, 13 Aug 2016 18:02:22 -0700 Subject: [PATCH 16/17] disable tests for macro-paradise for now https://github.com/scala/scala-dev/issues/203 --- common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.conf b/common.conf index 85b2d7660..836e6688d 100644 --- a/common.conf +++ b/common.conf @@ -479,7 +479,7 @@ build += { ${vars.base} { name: "macro-paradise", uri: "http://github.com/"${vars.macro-paradise-ref} - extra.run-tests: true + extra.run-tests: false // see https://github.com/scala/scala-dev/issues/203 } ${vars.base} { From 102dd8af2c3a7440b48331d0c4520303ffe363a1 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Sat, 13 Aug 2016 18:03:45 -0700 Subject: [PATCH 17/17] disable tests for twitter-util for now https://github.com/scala/scala-dev/issues/203 --- common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.conf b/common.conf index 836e6688d..a684b264f 100644 --- a/common.conf +++ b/common.conf @@ -553,7 +553,7 @@ build += { // this isn't really necessary and would pull in a JMH dependency extra.exclude: ["util-benchmark"] // TODO tests pass in 2.11.x-jdk8, why not here? - extra.run-tests: true + extra.run-tests: false // https://github.com/scala/scala-dev/issues/203#issuecomment-239649902 } ]}