diff --git a/build.sbt b/build.sbt index 4451c86ea..804682182 100644 --- a/build.sbt +++ b/build.sbt @@ -18,7 +18,6 @@ ThisBuild / version := { } ThisBuild / versionScheme := Some("early-semver") ThisBuild / organization := "org.scala-sbt" -ThisBuild / bintrayPackage := sys.env.get("BINTRAY_PACKAGE").getOrElse("librarymanagement") ThisBuild / homepage := Some(url("https://github.com/sbt/librarymanagement")) ThisBuild / description := "Library management module for sbt" ThisBuild / scmInfo := { @@ -32,6 +31,11 @@ ThisBuild / developers := List( Developer("eed3si9n", "Eugene Yokota", "@eed3si9n", url("http://eed3si9n.com/")), Developer("dwijnand", "Dale Wijnand", "@dwijnand", url("https://github.com/dwijnand")), ) +ThisBuild / pomIncludeRepository := (_ => false) // drop repos other than Maven Central from POM +ThisBuild / publishTo := { + val nexus = "https://oss.sonatype.org/" + Some("releases" at nexus + "service/local/staging/deploy/maven2") +} ThisBuild / Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat diff --git a/project/HouseRulesPlugin.scala b/project/HouseRulesPlugin.scala index f204ee310..b71b74434 100644 --- a/project/HouseRulesPlugin.scala +++ b/project/HouseRulesPlugin.scala @@ -2,24 +2,14 @@ package lmbuild import sbt._ import Keys._ -import bintray.BintrayPlugin -import bintray.BintrayPlugin.autoImport._ object HouseRulesPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin && BintrayPlugin + override def requires = plugins.JvmPlugin override def trigger = allRequirements - override def buildSettings: Seq[Def.Setting[_]] = baseBuildSettings override def projectSettings: Seq[Def.Setting[_]] = baseSettings - lazy val baseBuildSettings: Seq[Def.Setting[_]] = Seq( - bintrayOrganization := Some("sbt"), - bintrayRepository := sys.env.get("BINTRAY_REPOSITORY").getOrElse("maven-releases"), - ) - lazy val baseSettings: Seq[Def.Setting[_]] = Seq( - bintrayPackage := (ThisBuild / bintrayPackage).value, - bintrayRepository := (ThisBuild / bintrayRepository).value, scalacOptions ++= Seq("-encoding", "utf8"), scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlint"), scalacOptions += "-language:higherKinds", diff --git a/project/plugins.sbt b/project/plugins.sbt index d72359f9e..ce812048d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,5 @@ addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") -addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.2") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.1")