Skip to content

Commit 02a4a98

Browse files
authored
2.12: new Scala SHA (#1349)
1 parent b0bdfdb commit 02a4a98

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

nightly.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# January 13, 2021
2-
nightly=2.12.14-bin-ff03e5a
1+
# January 28, 2021
2+
nightly=2.12.14-bin-5f6e5a1

proj/doobie.conf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
// https://github.com/tpolecat/doobie.git#series/0.6.x
1+
// https://github.com/scalacommunitybuild/doobie.git#community-build-2.12 # was tpolecat, series/0.6.x
22

33
// dependency of scala-pet-store
44

5+
// forked (January 2021) to align versions of things with community build
6+
// in order to faciliate reproducing errors outside dbuild
7+
58
vars.proj.doobie: ${vars.base} {
69
name: "doobie"
7-
uri: "https://github.com/tpolecat/doobie.git#6eb0fd53c237b13d3fb5d705d6b0bc52a6d0e0ca"
10+
uri: "https://github.com/scalacommunitybuild/doobie.git#8d12d531250d671ef7c95cb2f1fff0cad055debc"
811

912
extra.options: ["-Xss16m"] // prevent stack overflow when compiling build definition
1013
extra.exclude: ["docs", "doobie", "bench"] // out of scope ("doobie" is just an aggregation, and causes missing-tut error)
11-
deps.inject: ${vars.base.deps.inject} ["org.typelevel#kind-projector"]
1214
extra.commands: ${vars.default-commands} [
13-
"removeDependency org.spire-math kind-projector"
14-
"""set libraryDependencies in ThisBuild += compilerPlugin("org.typelevel" %% "kind-projector" % "0.0.0")"""
1515
// as per https://github.com/scala/community-builds/pull/835#issuecomment-455729365,
1616
// these subprojects require a Postgres instance for the tests to run
17-
"set executeTests in postgres in Test := Tests.Output(TestResult.Passed, Map(), Iterable())"
18-
"set executeTests in `postgres-circe` in Test := Tests.Output(TestResult.Passed, Map(), Iterable())"
19-
"set executeTests in example in Test := Tests.Output(TestResult.Passed, Map(), Iterable())"
17+
"set postgres / Test / executeTests := Tests.Output(TestResult.Passed, Map(), Iterable())"
18+
"set `postgres-circe` / Test / executeTests := Tests.Output(TestResult.Passed, Map(), Iterable())"
19+
"set example / Test / executeTests := Tests.Output(TestResult.Passed, Map(), Iterable())"
2020
]
2121
}

proj/wartremover.conf

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
// https://github.com/wartremover/wartremover.git#d2c6e4671da00cec37e0fb85e428d16b3916da5e # was master
1+
// https://github.com/scalacommunitybuild/wartremover.git#community-build-2.12 # was wartremover, master
22

33
// frozen (January 2020) at a November 2019 commit just before a ScalaTest 3.1 upgrade
4+
// (https://github.com/scala/community-build/pull/1349)
5+
// forked (January 2021) from that freeze point
6+
// to cherry-pick https://github.com/wartremover/wartremover/pull/469 ;
7+
// see https://github.com/scala/community-build/pull/1349 for context
48

59
vars.proj.wartremover: ${vars.base} {
610
name: "wartremover"
7-
uri: "https://github.com/wartremover/wartremover.git#d2c6e4671da00cec37e0fb85e428d16b3916da5e"
11+
uri: "https://github.com/scalacommunitybuild/wartremover.git#5b94fac91f797df919d1bf922c902ff94c865223"
812

913
extra.exclude: ["sbt-plugin"]
1014
deps.ignore: ["org.scala-sbt#scripted-plugin"]

0 commit comments

Comments
 (0)