Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 2.12.x to 2.13.x, unfreeze, refreeze #980

Merged
merged 28 commits into from
Sep 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
dc63d6a
unfreeze project SHAs
SethTisue Sep 13, 2019
49ad8fb
Merge branch '2.12.x' into unfreeze-20190913
SethTisue Sep 14, 2019
dc2a62e
freeze mdoc and metaconfig
SethTisue Sep 14, 2019
151458d
Merge remote-tracking branch 'origin/2.12.x' into unfreeze-20190913
SethTisue Sep 14, 2019
739e669
fixups after unfreeze
SethTisue Sep 15, 2019
e3bd967
re-freeze all SHAs
SethTisue Sep 17, 2019
2d53ee2
Merge remote-tracking branch 'origin/2.12.x' into unfreeze-20190913
SethTisue Sep 20, 2019
9464736
Merge pull request #976 from SethTisue/unfreeze-20190913
SethTisue Sep 20, 2019
2298860
keep unfrozen config in version control (#978)
SethTisue Sep 20, 2019
c98bd17
fix scrooge and finagle on JDK 11
SethTisue Sep 21, 2019
1ea03f1
sbt 1.3.2 (was 1.3.0)
SethTisue Sep 21, 2019
00aac50
fix sttp (downgrade sbt)
SethTisue Sep 22, 2019
d184902
exclude finagle test that fails on JDK 11
SethTisue Sep 22, 2019
5dca345
Merge pull request #979 from SethTisue/fix-sttp
SethTisue Sep 22, 2019
a3e1253
Merge remote-tracking branch 'origin/2.12.x' into merge-to-2.13.x-201…
SethTisue Sep 23, 2019
98a416f
2.12: bump Scala SHA
SethTisue Sep 25, 2019
2b3449f
unfreeze ScalaCheck
SethTisue Sep 25, 2019
7e15124
2.13: unfreeze project SHAs
SethTisue Sep 23, 2019
a69f34c
re-freeze project SHAs (using run 2632)
SethTisue Sep 23, 2019
a013b3e
unfreeze ScalaCheck
SethTisue Sep 25, 2019
5718a7e
fixups after merging
SethTisue Sep 26, 2019
1900dd0
Merge commit '98a416fc5552f28f847850425deee31de90ae682' into merge-to…
SethTisue Sep 26, 2019
32a3e5e
Merge remote-tracking branch 'origin/2.12.x' into merge-to-2.13.x-201…
SethTisue Sep 26, 2019
4d2cd87
2.13: drop linter, it seems abandoned
SethTisue Sep 26, 2019
24f99ac
doobie: 2.13: use sbt 1.2
SethTisue Sep 26, 2019
4cbc1aa
2.13: finagle went green
SethTisue Sep 26, 2019
64f3158
2.13: drop mima, as per lightbend/mima#400
SethTisue Sep 26, 2019
df012da
stick with older monix and akka-http for now
SethTisue Sep 26, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 74 additions & 66 deletions configs/community.dbuild
Original file line number Diff line number Diff line change
Expand Up @@ -179,17 +179,14 @@ build += {
extra.projects: ["verifyJVM"]
}

// well, this is a nice problem to have: ScalaCheck is undergoing such active
// development at the moment (August 2019) that it's complicating community
// build work by causing repeated rebuild-the-worlds. so, froze it for now.
${vars.base} {
name: "scala-xml"
uri: ${vars.uris.scala-xml-uri}
extra.projects: ["xml"]
extra.commands: ${vars.base.extra.commands} [
// work around https://github.com/scala/community-builds/issues/575
// (in a community build context, we don't need MiMa to run)
"set every ScalaModulePlugin.mimaPreviousVersion := None"
"set every scalaModuleMimaPreviousVersion := None"
]
}

Expand Down Expand Up @@ -259,30 +256,33 @@ build += {
extra.commands: ${vars.base.extra.commands} [
// work around https://github.com/scala/community-builds/issues/575
// (in a community build context, we don't need MiMa to run)
"set every ScalaModulePlugin.mimaPreviousVersion := None"
"set every scalaModuleMimaPreviousVersion := None"
]
}

${vars.base} {
name: "scala-collection-contrib"
uri: ${vars.uris.scala-collection-contrib-uri}
extra.projects: ["scala-collection-contrib"] // just JVM
extra.projects: ["collectionContrib"] // just JVM
extra.commands: ${vars.base.extra.commands} [
// work around https://github.com/scala/community-builds/issues/575
// (in a community build context, we don't need MiMa to run)
"set every ScalaModulePlugin.mimaPreviousVersion := None"
"set every scalaModuleMimaPreviousVersion := None"
]
}

// frozen before upgrade to sbt-scala-module 2.1.x -- it's causing
// e.g. "Symbol 'type scala.collection.generic.GenericParTemplate' is missing from the classpath"
// downstream. I should definitely investigate, freezing for now so I can finish
// the current repo-wide unfreeze/refreeze
${vars.base} {
name: "scala-parallel-collections"
uri: ${vars.uris.scala-parallel-collections-uri}
// on 1.3.0-RC4, the hamcrest thing below didn't happen, but instead the entire junit dependency
// disappeared from the classpath. I couldn't reproduce it outside dbuild, and I couldn't
// find a workaround.
// perhaps same/related: https://github.com/coursier/coursier/issues/1336
extra.sbt-version: "1.2.8"
extra.commands: ${vars.base.extra.commands} [
// on sbt 1.3, unless we do this, `junit-4.11.jar` drops off the classpath
// and I could not figure out why, or reproduce it outside of build.
// downgrading to 1.2 doesn't solve it, because the repo uses a mima version which requires 1.3
"""set every useCoursier := false"""
// no idea why this would only be required in the community build context, but without it,
// we get java.lang.ClassNotFoundException: org.hamcrest.SelfDescribing
"""set libraryDependencies in junit += "org.hamcrest" % "hamcrest-core" % "1.3" % Test"""
Expand Down Expand Up @@ -310,14 +310,6 @@ build += {
uri: ${vars.uris.splain-uri}
}

// dependency of cats
${vars.base} {
name: "export-hook"
uri: ${vars.uris.export-hook-uri}
extra.sbt-version: ${vars.sbt-0-13-version}
extra.projects: ["coreJVM"] // no Scala.js plz
}

${vars.base} {
name: "scala-java-time"
uri: ${vars.uris.scala-java-time-uri}
Expand Down Expand Up @@ -382,9 +374,6 @@ build += {
check-missing: false
}

// frozen at v1.6.0 tag because dependencies have historically been fragile.
// (perhaps this is overly cautious now, in 2019? not sure)
// and forked (February 2019) from that tag to make some tiny ScalaCheck 1.13 vs 1.14 tweaks so tests pass
// 2.13: master is where 2.13 support is; frozen (May 2019) at April 2019 commit
// before ScalaTest 3.1 upgrade
${vars.base} {
Expand Down Expand Up @@ -471,7 +460,8 @@ build += {
// hopefully avoid intermittent OutOfMemoryErrors with default 1.5G heap?
"-Xmx2048m"
]
extra.projects: ["logging", "testSuite", "linker"]
// not really sure how this list was arrived at
extra.projects: [ "logging", "linker", "testSuite" ]
extra.commands: ${vars.default-commands} [
// - We disable source map tests to save ourselves a `npm install source-map-support` on the workers.
// Although only `testSuite` actually has tests, dbuild will try to run the tests for all projects
Expand Down Expand Up @@ -515,7 +505,8 @@ build += {
uri: ${vars.uris.scala-java8-compat-uri}
}

// frozen (May 2019) at May 2019 commit just before ScalaTest 3.1 upgrade
// forked (September 2019) for 2.13.1 compatibility. presumably support will be merged
// before too much longer and we can unfork
${vars.base} {
name: "silencer"
uri: ${vars.uris.silencer-uri}
Expand All @@ -542,7 +533,7 @@ build += {
"-Dakka.genjavadoc.enabled=false", "-Dakka.scaladoc.diagrams=false", "-Dakka.build.aggregateSamples=false", "-Dakka.test.tags.exclude=performance,timing,long-running", "-Dakka.test.multi-in-test=false"
]
extra.projects: ["akka-actor", "akka-actor-typed", "akka-testkit", "akka-actor-tests"]
extra.commands: ${vars.default-commands} [
extra.commands: ${vars.default-commands} [
// https://github.com/scala/community-builds/issues/373
"set every apiURL := None"
// needed downstream in akka-stream and/or akka-more
Expand All @@ -553,7 +544,8 @@ build += {
// see https://github.com/scala/community-builds/issues/757
"set scalacOptions in Compile in actor --= Seq(\"-release\", \"8\")"
// prone to intermittent failure
"""set actorTests / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "BackoffSupervisorSpec.scala" || "MetricsBasedResizerSpec.scala" || "EventStreamSpec.scala""""
// (except ByteStringSpec, which is https://github.com/akka/akka/issues/27793)
"""set actorTests / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "BackoffSupervisorSpec.scala" || "MetricsBasedResizerSpec.scala" || "EventStreamSpec.scala" || "ByteStringSpec.scala""""
"""set testkit / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "CoronerSpec.scala""""
]
}
Expand Down Expand Up @@ -588,7 +580,7 @@ build += {
extra.commands: ${vars.default-commands} [
// work around https://github.com/scala/community-builds/issues/575
// (in a community build context, we don't need MiMa to run)
"set every ScalaModulePlugin.mimaPreviousVersion := None"
"set every scalaModuleMimaPreviousVersion := None"
]
}

Expand All @@ -601,6 +593,7 @@ build += {
]
}

// 2.13: using Lukas's branch until https://github.com/scoverage/scalac-scoverage-plugin/pull/279 is merged
${vars.base} {
name: "scoverage"
uri: ${vars.uris.scoverage-uri}
Expand Down Expand Up @@ -741,6 +734,7 @@ build += {
"set every bintrayReleaseOnPublish := false"
"""set http2Support / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "WithPriorKnowledgeSpec.scala""""
"""set httpCore / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "GracefulTerminationSpec.scala""""
"""set httpTests / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "CodingDirectivesSpec.scala""""
]
}

Expand Down Expand Up @@ -958,8 +952,6 @@ build += {

// tracking "develop" branch.
// try master instead if develop proves too fragile?
// forked (August 2019) for JDK 11+ friendliness, pending merge of
// https://github.com/twitter/util/pull/255
${vars.base} {
name: "twitter-util"
uri: ${vars.uris.twitter-util-uri}
Expand Down Expand Up @@ -995,21 +987,6 @@ build += {
]
}

${vars.base} {
name: "mima"
uri: ${vars.uris.mima-uri}
extra.exclude: [
// we don't compile sbt plugins
"sbtplugin"
// awaiting word on https://github.com/lightbend/mima/issues/374
"test-value-class-generic-replacement-ko"
]
extra.options: ["-Xmx4g"]
// ignore missing scripted-sbt (https://github.com/sbt/sbt/issues/3917 ?)
deps.ignore: ["org.scala-sbt#scripted-sbt"]
check-missing: false
}

${vars.base} {
name: "mouse"
uri: ${vars.uris.mouse-uri}
Expand Down Expand Up @@ -1093,6 +1070,7 @@ build += {
}

// dependency of play-file-watch
// frozen (September 2019) at a July 2019 commit before ScalaTest 3.1 upgrade
${vars.base} {
name: "better-files"
uri: ${vars.uris.better-files-uri}
Expand Down Expand Up @@ -1163,6 +1141,8 @@ build += {
${vars.base} {
name: "sconfig"
uri: ${vars.uris.sconfig-uri}
// java.lang.NoClassDefFoundError: xerial/sbt/Sonatype$
extra.sbt-version: ${vars.sbt-1-2-version}
extra.exclude: ["sconfigNative", "sconfigJS"]
extra.commands: ${vars.default-commands} [
// spray org change (July 2019). presumably before long spray-json will
Expand Down Expand Up @@ -1254,10 +1234,20 @@ build += {
extra.projects: ["minitestJVM", "lawsJVM", "lawsLegacyJVM"] // no Scala.js
}

// forked awaiting merge of https://github.com/monix/monix/pull/875
// dependency of monix
${vars.base} {
name: "implicitbox"
uri: ${vars.uris.implicitbox-uri}
extra.projects: ["implicitboxJVM"]
}

// frozen, using a contributor's fork.
// until the big ScalaTest move, it's difficult to find a SHA that isn't too new or too old
${vars.base} {
name: "monix"
uri: ${vars.uris.monix-uri}
// error: not found: value sonatypeProfileName
extra.sbt-version: ${vars.sbt-1-2-version}
extra.options: ["-Dmonix.requireJava8=false"]
// no Scala.js, no benchmarks.
extra.projects: ["coreJVM"]
Expand Down Expand Up @@ -1392,6 +1382,8 @@ build += {
${vars.base} {
name: "doodle"
uri: ${vars.uris.doodle-uri}
// error: not found: value sonatypePublishToBundle
extra.sbt-version: ${vars.sbt-1-2-version}
extra.projects: [
"coreJVM", "java2d", "exploreJVM", "imageJVM", "turtleJVM" // no Scala.js plz
]
Expand Down Expand Up @@ -1523,6 +1515,8 @@ build += {
${vars.base} {
name: "paradox"
uri: ${vars.uris.paradox-uri}
// Common.scala:22:8: not found: object xerial
extra.sbt-version: ${vars.sbt-1-2-version}
extra.exclude: ["plugin", "themePlugin", "genericTheme"]
check-missing: false // ignore missing scripted-sbt, kind-projector
deps.inject: ${vars.base.deps.inject} [ "org.typelevel#kind-projector" ]
Expand Down Expand Up @@ -1656,14 +1650,6 @@ build += {
uri: ${vars.uris.scapegoat-uri}
}

${vars.base} {
name: "linter"
uri: ${vars.uris.linter-uri}
extra.sbt-version: ${vars.sbt-0-13-version}
// test failures; see https://github.com/scala/community-builds/pull/696
extra.test-tasks: "compile"
}

${vars.base} {
name: "scala-newtype"
uri: ${vars.uris.scala-newtype-uri}
Expand All @@ -1673,15 +1659,11 @@ build += {
${vars.base} {
name: "fast-string-interpolator"
uri: ${vars.uris.fast-string-interpolator-uri}
extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
extra.commands: ${vars.default-commands} [
"set every bintrayReleaseOnPublish := false"
]
// Missing dependency: com.dongxiguo#fastring
// Missing dependency: com.dongxiguo#fastring. likely out of scope anyway
extra.exclude: ["fsi-benchmark", "fsi-benchmark-core"]
}

// frozen (June 2019) at a June 2019 config just before a sbt-coursier
// frozen (June 2019) at a June 2019 commit some time before a sbt-coursier
// version bump that seems to be confusing dbuild during dependency extraction:
// [scalacheck-shapeless] [error] java.lang.NoSuchMethodError: lmcoursier.definitions.ToCoursier$.project(Llmcoursier/definitions/Project;)Lcoursier/core/Project;
// [scalacheck-shapeless] [error] at coursier.sbtcoursier.ResolutionTasks$.$anonfun$resolutionsTask$3(ResolutionTasks.scala:42)
Expand Down Expand Up @@ -1861,6 +1843,10 @@ build += {
]
}

// frozen (Sep 2019) at an Aug 2019 commit before we got this:
// Processing subproject: testsJVM
// **** Missing dependency: the library io.get-coursier#coursier is not provided
// I didn't investigate, we can deal with it in some future unfreeze
${vars.base} {
name: "scalameta"
uri: ${vars.uris.scalameta-uri}
Expand Down Expand Up @@ -1921,6 +1907,10 @@ build += {
]
}

// frozen (September 2019) at a April 2019 commit just before a sbt-coursier
// version bump that seems to be confusing dbuild during dependency extraction:
// java.lang.NoSuchMethodError: lmcoursier.definitions.ToCoursier$.project(Llmcoursier/definitions/Project;)Lcoursier/core/Project;
// at coursier.sbtcoursier.ResolutionTasks$.$anonfun$resolutionsTask$3(ResolutionTasks.scala:42)
${vars.base} {
name: "metaconfig"
uri: ${vars.uris.metaconfig-uri}
Expand Down Expand Up @@ -2020,6 +2010,10 @@ build += {
uri: ${vars.uris.pascal-uri}
}

// frozen (September 2019) at an August 2019 commit some time before a sbt-coursier
// version bump that seems to be confusing dbuild during dependency extraction:
// java.lang.NoSuchMethodError: lmcoursier.definitions.ToCoursier$.project(Llmcoursier/definitions/Project;)Lcoursier/core/Project;
// at coursier.sbtcoursier.ResolutionTasks$.$anonfun$resolutionsTask$3(ResolutionTasks.scala:42)
${vars.base} {
name: "mdoc"
uri: ${vars.uris.mdoc-uri}
Expand Down Expand Up @@ -2072,7 +2066,9 @@ build += {
// I didn't attempt to add any other subprojects
extra.projects: ["finagle-core"]
extra.commands: ${vars.default-commands} [
"""set finagleCore / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "FailFastFactoryTest.scala""""
"""set finagleCore / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "FailFastFactoryTest.scala" || "StringServerTest.scala""""
// not supported on JDK 11+
"removeJavaOptions -XX:+UseParNewGC"
]
}

Expand Down Expand Up @@ -2285,6 +2281,10 @@ build += {
}

// in this space because it depends on pureconfig
// frozen (September 2019) at a July 2019 commit before this error occurred:
// Processing subproject: catsJVM
// **** Missing dependency: the library org.typelevel#discipline-scalatest is not provided
// let's revisit when we move to ScalaTest 3.1
${vars.base} {
name: "refined"
uri: ${vars.uris.refined-uri}
Expand All @@ -2296,14 +2296,11 @@ build += {
// it with right now.
extra.projects: ["catsJVM", "coreJVM", "evalJVM", "jsonpathJVM", "scalacheckJVM", "shapelessJVM"]
extra.exclude: ["scalacheck_1_13JVM"]
extra.commands: ${vars.default-commands} [
// as per https://github.com/fthomas/refined/issues/661 , this test can be re-enabled
// once the repo is upgraded to 2.13.1
"""set coreJVM / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "AdjacentSpec.scala""""
]
}

// in this space because it depends on refined (though not in core, only in avro4s-refined subproject)
// tempoarily forked (September 2019) for Scala 2.13.1 friendliness, pending merge of
// https://github.com/sksamuel/avro4s/pull/377
${vars.base} {
name: "avro4s"
uri: ${vars.uris.avro4s-uri}
Expand All @@ -2317,6 +2314,11 @@ build += {
}

// depends on atto
// frozen (September 2019) at an August 2019 commit some time before this
// started happening (during regular build, not during dependency extraction):
// [droste] [info] Wrote /home/jenkins/workspace/scala-2.12.x-integrate-community-build/target-0.9.16/project-builds/droste-eb96026c097f9944a71ea72d767bf9b274655ea9/modules/meta/.jvm/target/scala-2.12/droste-meta-0.7.1-dbuildxeb96026c097f9944a71ea72d767bf9b274655ea9.pom
// [droste] [error] java.lang.NoSuchMethodError: lmcoursier.definitions.ToCoursier$.project(Llmcoursier/definitions/Project;)Lcoursier/core/Project;
// [droste] [error] at coursier.sbtcoursier.ResolutionTasks$.$anonfun$resolutionsTask$3(ResolutionTasks.scala:42)
${vars.base} {
name: "droste"
uri: ${vars.uris.droste-uri}
Expand Down Expand Up @@ -2344,6 +2346,8 @@ build += {
extra.projects: ["declineJVM", "refinedJVM"] // no Scala.js, no doc
}

// frozen (September 2019) at an August 2019 commit sometime before a silencer
// upgrade; we have silencer frozen waiting on ScalaTest 3.1
${vars.base} {
name: "sttp"
uri: ${vars.uris.sttp-uri}
Expand Down Expand Up @@ -2372,6 +2376,8 @@ build += {
extra.commands: ${vars.default-commands} [
"set every bintrayReleaseOnPublish := false"
"set every bintrayOmitLicense := true" // otherwise it complains we don't have one
// not supported on JDK 11+
"removeJavaOptions -XX:+UseParNewGC"
]
extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
// ignore missing scripted-sbt (https://github.com/sbt/sbt/issues/3917 ?)
Expand Down Expand Up @@ -2411,6 +2417,8 @@ build += {
${vars.base} {
name: "doobie"
uri: ${vars.uris.doobie-uri}
// java.lang.NoClassDefFoundError: xerial/sbt/Sonatype$
extra.sbt-version: ${vars.sbt-1-2-version}
extra.options: ["-Xss16m"] // prevent stack overflow when compiling build definition
extra.exclude: ["docs", "doobie", "bench"] // out of scope ("doobie" is just an aggregation, and causes missing-tut error)
deps.inject: ${vars.base.deps.inject} ["org.typelevel#kind-projector"]
Expand Down
Loading