Skip to content

Commit 24f67c2

Browse files
dppdpp
authored
Merge pull request #2000 from lvitaly/bump_sbt_version
bump sbt version
2 parents 5a08200 + dc830ae commit 24f67c2

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed

‎build.sbt‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
import Dependencies._
22
import LiftSbtHelpers._
33

4-
organization in ThisBuild := "net.liftweb"
5-
version in ThisBuild := "3.6.0-SNAPSHOT"
6-
homepage in ThisBuild := Some(url("http://www.liftweb.net"))
7-
licenses in ThisBuild += ("Apache License, Version 2.0", url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
8-
startYear in ThisBuild := Some(2006)
9-
organizationName in ThisBuild := "WorldWide Conferencing, LLC"
4+
ThisBuild / organization := "net.liftweb"
5+
ThisBuild / version := "3.6.0-SNAPSHOT"
6+
ThisBuild / homepage := Some(url("https://www.liftweb.net"))
7+
ThisBuild / licenses += ("Apache License, Version 2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt"))
8+
ThisBuild / startYear := Some(2006)
9+
ThisBuild / organizationName := "WorldWide Conferencing, LLC"
1010

1111
val scala211Version = "2.11.12"
12-
val scala212Version = "2.12.12"
13-
val scala213Version = "2.13.2"
12+
val scala212Version = "2.12.15"
13+
val scala213Version = "2.13.8"
1414

1515
val crossUpTo212 = Seq(scala212Version, scala211Version)
1616
val crossUpTo213 = scala213Version +: crossUpTo212
1717

18-
scalaVersion in ThisBuild := scala212Version
19-
crossScalaVersions in ThisBuild := crossUpTo212 // default everyone to 2.12 for now
18+
ThisBuild / scalaVersion := scala212Version
19+
ThisBuild / crossScalaVersions := crossUpTo212 // default everyone to 2.12 for now
2020

21-
libraryDependencies in ThisBuild ++= Seq(specs2, specs2Matchers, specs2Mock, scalacheck, scalactic, scalatest)
21+
ThisBuild / libraryDependencies ++= Seq(specs2, specs2Matchers, specs2Mock, scalacheck, scalactic, scalatest)
2222

23-
scalacOptions in ThisBuild ++= Seq("-deprecation")
23+
ThisBuild / scalacOptions ++= Seq("-deprecation")
2424

2525
// Settings for Sonatype compliance
26-
pomIncludeRepository in ThisBuild := { _ => false }
27-
publishTo in ThisBuild := {
26+
ThisBuild / pomIncludeRepository := { _ => false }
27+
ThisBuild / publishTo := {
2828
if (isSnapshot.value) {
2929
Some(Opts.resolver.sonatypeSnapshots)
3030
} else {
3131
Some(Opts.resolver.sonatypeStaging)
3232
}
3333
}
34-
scmInfo in ThisBuild := Some(ScmInfo(url("https://github.com/lift/framework"), "scm:git:https://github.com/lift/framework.git"))
35-
pomExtra in ThisBuild := Developers.toXml
34+
ThisBuild / scmInfo := Some(ScmInfo(url("https://github.com/lift/framework"), "scm:git:https://github.com/lift/framework.git"))
35+
ThisBuild / pomExtra := Developers.toXml
3636

37-
credentials in ThisBuild += Credentials(BuildPaths.getGlobalSettingsDirectory(state.value, BuildPaths.getGlobalBase(state.value)) / ".credentials")
37+
ThisBuild / credentials += Credentials(BuildPaths.getGlobalSettingsDirectory(state.value, BuildPaths.getGlobalBase(state.value)) / ".credentials")
3838

3939
initialize := {
4040
printLogo(name.value, version.value, scalaVersion.value)
4141
}
4242

43-
resolvers in ThisBuild ++= Seq(
43+
ThisBuild / resolvers ++= Seq(
4444
"snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
4545
"releases" at "https://oss.sonatype.org/content/repositories/releases"
4646
)
@@ -70,15 +70,15 @@ lazy val actor =
7070
.dependsOn(common)
7171
.settings(
7272
description := "Simple Actor",
73-
parallelExecution in Test := false
73+
Test / parallelExecution := false
7474
)
7575
.settings(crossScalaVersions := crossUpTo213)
7676

7777
lazy val markdown =
7878
coreProject("markdown")
7979
.settings(
8080
description := "Markdown Parser",
81-
parallelExecution in Test := false,
81+
Test / parallelExecution := false,
8282
libraryDependencies ++= Seq(scalatest, scalatest_junit, scala_xml, scala_parser)
8383
)
8484
.settings(crossScalaVersions := crossUpTo213)
@@ -87,7 +87,7 @@ lazy val json =
8787
coreProject("json")
8888
.settings(
8989
description := "JSON Library",
90-
parallelExecution in Test := false,
90+
Test / parallelExecution := false,
9191
libraryDependencies ++= Seq(scalap(scalaVersion.value), paranamer, scala_xml)
9292
)
9393
.settings(crossScalaVersions := crossUpTo213)
@@ -121,7 +121,7 @@ lazy val util =
121121
.dependsOn(actor, json, markdown)
122122
.settings(
123123
description := "Utilities Library",
124-
parallelExecution in Test := false,
124+
Test / parallelExecution := false,
125125
libraryDependencies ++= Seq(
126126
scala_compiler(scalaVersion.value),
127127
joda_time,
@@ -155,7 +155,7 @@ lazy val webkit =
155155
.dependsOn(util, testkit % "provided")
156156
.settings(
157157
description := "Webkit Library",
158-
parallelExecution in Test := false,
158+
Test / parallelExecution := false,
159159
libraryDependencies ++= Seq(
160160
commons_fileupload,
161161
rhino,
@@ -175,26 +175,26 @@ lazy val webkit =
175175
case _ => Seq.empty
176176
}
177177
},
178-
initialize in Test := {
178+
Test / initialize := {
179179
System.setProperty(
180180
"net.liftweb.webapptest.src.test.webapp",
181-
((sourceDirectory in Test).value / "webapp").absString
181+
((Test / sourceDirectory).value / "webapp").absString
182182
)
183183
},
184-
unmanagedSourceDirectories in Compile += {
185-
(sourceDirectory in Compile).value / ("scala_" + scalaBinaryVersion.value)
184+
Compile / unmanagedSourceDirectories += {
185+
(Compile / sourceDirectory).value / ("scala_" + scalaBinaryVersion.value)
186186
},
187-
unmanagedSourceDirectories in Test += {
188-
(sourceDirectory in Test).value / ("scala_" + scalaBinaryVersion.value)
187+
Test / unmanagedSourceDirectories += {
188+
(Test / sourceDirectory).value / ("scala_" + scalaBinaryVersion.value)
189189
},
190-
compile in Compile := (compile in Compile).dependsOn(WebKeys.assets).value,
190+
Compile / compile := (Compile / compile).dependsOn(WebKeys.assets).value,
191191
/**
192192
* This is to ensure that the tests in net.liftweb.webapptest run last
193193
* so that other tests (MenuSpec in particular) run before the SiteMap
194194
* is set.
195195
*/
196-
testGrouping in Test := {
197-
(definedTests in Test).map { tests =>
196+
Test / testGrouping := {
197+
(Test / definedTests).map { tests =>
198198
import Tests._
199199

200200
val (webapptests, others) = tests.partition { test =>
@@ -233,12 +233,12 @@ lazy val mapper =
233233
.dependsOn(db, proto)
234234
.settings(
235235
description := "Mapper Library",
236-
parallelExecution in Test := false,
236+
Test / parallelExecution := false,
237237
libraryDependencies ++= Seq(h2, derby, jbcrypt),
238-
initialize in Test := {
238+
Test / initialize := {
239239
System.setProperty(
240240
"derby.stream.error.file",
241-
((crossTarget in Test).value / "derby.log").absolutePath
241+
((Test / crossTarget).value / "derby.log").absolutePath
242242
)
243243
}
244244
)
@@ -260,12 +260,12 @@ lazy val mongodb =
260260
.dependsOn(json_ext, util)
261261
.settings(
262262
crossScalaVersions := crossUpTo213,
263-
parallelExecution in Test := false,
263+
Test / parallelExecution := false,
264264
libraryDependencies ++= Seq(mongo_java_driver, mongo_java_driver_async),
265-
initialize in Test := {
265+
Test / initialize := {
266266
System.setProperty(
267267
"java.util.logging.config.file",
268-
((resourceDirectory in Test).value / "logging.properties").absolutePath
268+
((Test / resourceDirectory).value / "logging.properties").absolutePath
269269
)
270270
}
271271
)
@@ -275,5 +275,5 @@ lazy val mongodb_record =
275275
.dependsOn(record, mongodb)
276276
.settings(
277277
crossScalaVersions := crossUpTo213,
278-
parallelExecution in Test := false
278+
Test / parallelExecution := false
279279
)

‎project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.12
1+
sbt.version=1.6.2

‎project/plugins.sbt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
DefaultOptions.addPluginResolvers
22
resolvers += Resolver.typesafeRepo("releases")
33

4-
addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.3")
4+
addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.4")
55
//addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "2.1.3")
66

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

10-
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")
10+
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")

0 commit comments

Comments
 (0)