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 4 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
13 changes: 7 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ lazy val framework =
case _ =>
Seq()
}) //workaround for scala/scala-dev#249
.settings(aggregatedSetting(sources in(Compile, doc)),
aggregatedSetting(dependencyClasspath in(Compile, doc)),
publishArtifact := false)
/*.settings(
(sources / aggregate) in (Compile, doc),
aggregatedSetting(dependencyClasspath in(Compile, doc)),
publishArtifact := false
)*/
Copy link
Member

Choose a reason for hiding this comment

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

Is this something we can nuke now?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, yes, I had planned to replace this with the unidoc plugin but under either implementation I'm getting..... fun errrors:

[error] (lift-mapper / Compile / doc) java.net.URISyntaxException: Illegal character in path at index 45: http://www.scala-lang.org/api/SettingKey(This / This / This / version)/scala/xml/NodeSeq.html


// Core Projects
// -------------
Expand Down Expand Up @@ -155,8 +157,8 @@ lazy val webkit =
commons_fileupload,
rhino,
servlet_api,
specs2.copy(configurations = Some("provided")),
specs2Matchers.copy(configurations = Some("provided")),
specs2Main,
specs2MatchersMain,
Copy link
Member

Choose a reason for hiding this comment

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

The new one puts it on the classpath, while the old one marked it provided (~= not on the classpath via sbt, but on the classpath via external means?). Not fully following the difference in what we were doing vs what we're doing now.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ahhhhh right you are.

jetty6,
jwebunit,
mockito_all,
Expand Down Expand Up @@ -205,7 +207,6 @@ lazy val webkit =
} //workaround for scala/scala-dev#249
}
)
.settings(yuiCompressor.Plugin.yuiSettings: _*)
.enablePlugins(SbtWeb)

// Persistence Projects
Expand Down
12 changes: 5 additions & 7 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,11 @@

import sbt._
import Keys._
import net.liftweb.sbt.LiftBuildPlugin.{crossMapped, defaultOrMapped}


object Dependencies {

type ModuleMap = String => ModuleID

lazy val CVMappingAll = crossMapped("2.11.7" -> "2.11")

lazy val slf4jVersion = "1.7.25"

// Compile scope:
Expand All @@ -40,11 +36,11 @@ object Dependencies {
lazy val mongo_java_driver = "org.mongodb" % "mongodb-driver" % "3.7.1"
lazy val mongo_java_driver_async = "org.mongodb" % "mongodb-driver-async" % "3.7.1"
lazy val paranamer = "com.thoughtworks.paranamer" % "paranamer" % "2.8"
lazy val scalajpa = "org.scala-libs" % "scalajpa" % "1.5" cross CVMappingAll
lazy val scalajpa = "org.scala-libs" % "scalajpa" % "1.5"
lazy val scalap: ModuleMap = "org.scala-lang" % "scalap" % _
lazy val scala_compiler: ModuleMap = "org.scala-lang" % "scala-compiler" % _
lazy val scalaz7_core = "org.scalaz" % "scalaz-core" % "7.2.24" cross CVMappingAll
lazy val squeryl = "org.squeryl" % "squeryl" % "0.9.5-7" cross CVMappingAll
lazy val scalaz7_core = "org.scalaz" % "scalaz-core" % "7.2.24"
lazy val squeryl = "org.squeryl" % "squeryl" % "0.9.5-7"
lazy val slf4j_api = "org.slf4j" % "slf4j-api" % slf4jVersion
lazy val scala_xml = "org.scala-lang.modules" %% "scala-xml" % "1.0.6"
lazy val rhino = "org.mozilla" % "rhino" % "1.7.10"
Expand Down Expand Up @@ -87,7 +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"
Copy link
Member

Choose a reason for hiding this comment

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

Why did we need this main-classpath variant?

Copy link
Member Author

Choose a reason for hiding this comment

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

webkit provides some things that depend on specs2 (e.g. MockWeb)

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 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
3 changes: 0 additions & 3 deletions project/LiftSbtHelpers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
import sbt._
import Keys._

import net.liftweb.sbt.LiftBuildPlugin._

object LiftSbtHelpers {
def coreProject = liftProject("core") _
def webProject = liftProject("web") _
Expand All @@ -39,7 +37,6 @@ object LiftSbtHelpers {

def liftProject(id: String, base: File): Project = {
Project(id, base)
.settings(liftBuildSettings: _*)
.settings(scalacOptions ++= List("-feature", "-language:implicitConversions"))
.settings(
autoAPIMappings := true,
Expand Down
3 changes: 1 addition & 2 deletions project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# Deprecate using build.properties, use -Dsbt.version=... in launcher arg instead
sbt.version=0.13.16
sbt.version=1.2.6
11 changes: 5 additions & 6 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
DefaultOptions.addPluginResolvers

resolvers += "sbt-idea-repo" at "http://mpeltonen.github.com/maven/"

addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")

resolvers += Resolver.typesafeRepo("releases")

addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.2.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.3")
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)
7 changes: 0 additions & 7 deletions project/project/Plugin.scala
View file
Open in desktop

This file was deleted.