diff --git a/build.sbt b/build.sbt index e9630bb0f7..c6b7c3816b 100644 --- a/build.sbt +++ b/build.sbt @@ -8,22 +8,6 @@ Global / bspEnabled := false autoStartServer := false Global / excludeLintKeys += autoStartServer -inThisBuild( - List( - organization := "org.scalablytyped.converter", - homepage := Some(url("https://github.com/ScalablyTyped/Converter")), - licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), - developers := List( - Developer( - "oyvindberg", - "Øyvind Raddum Berg", - "elacin@gmail.com", - url("https://github.com/oyvindberg") - ), - ), - ), -) - lazy val utils = project .configure(baseSettings) .settings(libraryDependencies ++= Seq(Deps.ammoniteOps, Deps.osLib, Deps.sourcecode) ++ Deps.circe) @@ -131,15 +115,20 @@ lazy val root = project lazy val baseSettings: Project => Project = _.settings( + sonatypeCredentialHost := Sonatype.sonatype01, + organization := "org.scalablytyped", licenses += ("GPL-3.0", url("https://opensource.org/licenses/GPL-3.0")), - scalaVersion := "2.12.13", - scalacOptions ~= (_.filterNot( - Set( - "-Ywarn-unused:imports", - "-Ywarn-unused:params", - "-Xfatal-warnings", + homepage := Some(url("https://github.com/ScalablyTyped/Converter")), + developers := List( + Developer( + "oyvindberg", + "Øyvind Raddum Berg", + "elacin@gmail.com", + url("https://github.com/oyvindberg"), ), - )), + ), + scalaVersion := "2.12.13", + scalacOptions ~= (_.filterNot(Set("-Ywarn-unused:imports", "-Ywarn-unused:params", "-Xfatal-warnings"))), /* disable scaladoc */ sources in (Compile, doc) := Nil, ) diff --git a/project/build.properties b/project/build.properties index 7de0a9382f..dbae93bcfd 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.4 +sbt.version=1.4.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index b5036bceed..cd5eb9724e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,3 +5,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.8") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.6") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") // remove on next release of sbt-ci-release