PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-20 02:24:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade SBT to 1.3.6 (#322)

Browse source
This commit is contained in:
pschord 2020-01-13 17:59:24 -05:00 committed by GitHub
parent ab625d15c4
commit b1be0ffdb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
build.sbt
View file

@ -1,3 +1,5 @@
import xerial.sbt.pack.PackPlugin._
lazy val commonSettings = Seq( lazy val commonSettings = Seq(
organization := "net.psforever", organization := "net.psforever",
version := "1.0.2-SNAPSHOT", version := "1.0.2-SNAPSHOT",
@ -10,16 +12,9 @@ lazy val commonSettings = Seq(
testOptions in QuietTest += Tests.Argument(TestFrameworks.Specs2, "showOnly", "x!"), testOptions in QuietTest += Tests.Argument(TestFrameworks.Specs2, "showOnly", "x!"),
// http://www.scalatest.org/user_guide/using_the_runner // http://www.scalatest.org/user_guide/using_the_runner
testOptions in QuietTest += Tests.Argument(TestFrameworks.ScalaTest, "-oCEHILMNOPQRX"), testOptions in QuietTest += Tests.Argument(TestFrameworks.ScalaTest, "-oCEHILMNOPQRX"),
// TODO: remove when upgraded to SBT 1.0+ https://github.com/sbt/sbt/pull/2747/files
ivyLoggingLevel := {
// This will suppress "Resolving..." logs on Jenkins and Travis.
if (sys.env.get("BUILD_NUMBER").isDefined || sys.env.get("CI").isDefined) UpdateLogging.Quiet
else UpdateLogging.Default
},
// Trick taken from https://groups.google.com/d/msg/scala-user/mxV9ok7J_Eg/kt-LnsrD0bkJ // Trick taken from https://groups.google.com/d/msg/scala-user/mxV9ok7J_Eg/kt-LnsrD0bkJ
// scaladoc flags: https://github.com/scala/scala/blob/2.11.x/src/scaladoc/scala/tools/nsc/doc/Settings.scala // scaladoc flags: https://github.com/scala/scala/blob/2.11.x/src/scaladoc/scala/tools/nsc/doc/Settings.scala
scalacOptions in (Compile,doc) <<= baseDirectory map { scalacOptions in (Compile,doc) := { Seq(
bd => Seq(
"-groups", "-groups",
"-implicits", "-implicits",
"-doc-title", "PSF-LoginServer - ", "-doc-title", "PSF-LoginServer - ",
@ -27,7 +22,7 @@ lazy val commonSettings = Seq(
"-doc-footer", "Copyright PSForever", "-doc-footer", "Copyright PSForever",
// For non unidoc builds, you may need bd.getName before the template parameter // For non unidoc builds, you may need bd.getName before the template parameter
"-doc-source-url", "https://github.com/psforever/PSF-LoginServer/blob/master/€{FILE_PATH}.scala", "-doc-source-url", "https://github.com/psforever/PSF-LoginServer/blob/master/€{FILE_PATH}.scala",
"-sourcepath", bd.getAbsolutePath // needed for scaladoc relative source paths "-sourcepath", baseDirectory.value.getAbsolutePath // needed for scaladoc relative source paths
) )
}, },
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots", resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
@ -59,7 +54,8 @@ lazy val pscryptoSettings = Seq(
unmanagedClasspath in Compile += (baseDirectory in ThisBuild).value / "pscrypto-lib" unmanagedClasspath in Compile += (baseDirectory in ThisBuild).value / "pscrypto-lib"
) )
lazy val psloginPackSettings = packAutoSettings ++ Seq( lazy val psloginPackSettings = Seq(
packMain := Map("ps-login" -> "PsLogin"),
packArchivePrefix := "pslogin", packArchivePrefix := "pslogin",
packExtraClasspath := Map("ps-login" -> Seq("${PROG_HOME}/pscrypto-lib", packExtraClasspath := Map("ps-login" -> Seq("${PROG_HOME}/pscrypto-lib",
"${PROG_HOME}/config")), "${PROG_HOME}/config")),
@ -69,10 +65,12 @@ lazy val psloginPackSettings = packAutoSettings ++ Seq(
lazy val root = (project in file(".")). lazy val root = (project in file(".")).
configs(QuietTest). configs(QuietTest).
enablePlugins(PackPlugin).
settings(commonSettings: _*). settings(commonSettings: _*).
//enablePlugins(ScalaUnidocPlugin).
settings(psloginPackSettings: _*). settings(psloginPackSettings: _*).
aggregate(pslogin, common) //enablePlugins(ScalaUnidocPlugin).
aggregate(pslogin, common).
dependsOn(pslogin, common)
lazy val pslogin = (project in file("pslogin")). lazy val pslogin = (project in file("pslogin")).
configs(QuietTest). configs(QuietTest).

2
project/build.properties
View file

@ -1 +1 @@
sbt.version = 0.13.8 sbt.version = 1.3.6

4
project/plugins.sbt
View file

@ -1,6 +1,6 @@
logLevel := Level.Warn logLevel := Level.Warn
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.7.9") addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.12")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
// https://github.com/sbt/sbt-unidoc // https://github.com/sbt/sbt-unidoc
//addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2") //addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")