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.

Sign up for GitHub

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

Upgrade to sbt 1.2.6 #1954

Merged
merged 9 commits into from
Apr 8, 2019
Merged

Upgrade to sbt 1.2.6 #1954

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b1d7cdb
sbt 1.2.6 boots, albeit without our fun logo
farmdawgnation Nov 19, 2018
a06fbd3
Get the LiftBuildPlugin properly included again
farmdawgnation Nov 19, 2018
ac3069a
Remove the yui compressor plugin
farmdawgnation Nov 20, 2018
9ff6b35
Add a variant of specs 2 that appears on the main classpath
farmdawgnation Apr 6, 2019
9bcb5ad
Fix designation of a few scala dependencies
farmdawgnation Apr 6, 2019
ec82f26
Fix reference to scala.xml
farmdawgnation Apr 6, 2019
e359d05
Catch a raw xml reference that I missed previously
farmdawgnation Apr 6, 2019
78427fb
Switch the specs2 deps in webkit to provided
farmdawgnation Apr 6, 2019
ac94821
Add sbt-unidoc for generating global docs
farmdawgnation Apr 6, 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
10 changes: 3 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,7 @@ lazy val framework =
case _ =>
Seq()
}) //workaround for scala/scala-dev#249
/*.settings(
(sources / aggregate) in (Compile, doc),
aggregatedSetting(dependencyClasspath in(Compile, doc)),
publishArtifact := false
)*/
.enablePlugins(ScalaUnidocPlugin)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to check---is this still officially a workaround for scala/scala-dev#249 per the comment above it? Happy to make this edit.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. To be clear this comment about the Scala bug is for the block above, not the block below 😬

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These lines are about the compiled mega docs. It’s currently misbehaving but I think this PR is still a win.


// Core Projects
// -------------
Expand Down Expand Up @@ -157,8 +153,8 @@ lazy val webkit =
commons_fileupload,
rhino,
servlet_api,
specs2Main,
specs2MatchersMain,
specs2Prov,
specs2MatchersProv,
jetty6,
jwebunit,
mockito_all,
Expand Down
2 changes: 1 addition & 1 deletion persistence/mapper/src/main/scala/net/liftweb/mapper/view/Util.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ object Util {
* argument.
*/
def bindFields[T <: Mapper[T]](mapper: T, nsfn: MappedField[_,T]=>NodeSeq): NodeSeq=>NodeSeq = {
case xml.Elem(_, name, _, _, _*) =>
case scala.xml.Elem(_, name, _, _, _*) =>
mapper.fieldByName(name) match {
case Full(field) => nsfn(field)
case _ => NodeSeq.Empty
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ object Dependencies {
lazy val mockito_all = "org.mockito" % "mockito-all" % "1.9.0" % "test"
lazy val scalacheck = "org.specs2" %% "specs2-scalacheck" % "3.8.6" % "test"
lazy val specs2 = "org.specs2" %% "specs2-core" % "3.8.6" % "test"
lazy val specs2Main = "org.specs2" %% "specs2-core" % "3.8.6"
lazy val specs2Prov = "org.specs2" %% "specs2-core" % "3.8.6" % "provided"
lazy val specs2Matchers = "org.specs2" %% "specs2-matcher-extra" % "3.8.6" % "test"
lazy val specs2MatchersMain = "org.specs2" %% "specs2-matcher-extra" % "3.8.6"
lazy val specs2MatchersProv = "org.specs2" %% "specs2-matcher-extra" % "3.8.6" % "provided"
lazy val specs2Mock = "org.specs2" %% "specs2-mock" % "3.8.6" % "test"
lazy val scalatest = "org.scalatest" %% "scalatest" % "3.0.1" % "test"
lazy val junit = "junit" % "junit" % "4.8.2" % "test"
Expand Down
2 changes: 2 additions & 0 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "2.1.3")

lazy val buildPlugin = RootProject(uri("git://github.com/lift/sbt-lift-build.git#f9c52bda7b43a98b9f8805c654c713d99db0a58f"))
lazy val root = (project in file(".")).dependsOn(buildPlugin)

addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")