diff --git a/build.sbt b/build.sbt index e0eb179bfa..07e262cf5c 100644 --- a/build.sbt +++ b/build.sbt @@ -58,7 +58,7 @@ ThisBuild / organization := "org.scala-sbt" ThisBuild / licenses := List(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))) ThisBuild / scalafmtOnCompile := !(Global / insideCI).value ThisBuild / Test / scalafmtOnCompile := !(Global / insideCI).value -ThisBuild / bintrayPackage := "zinc" +ThisBuild / bintrayPackage := sys.env.get("BINTRAY_PACKAGE").getOrElse("zinc") ThisBuild / scmInfo := Some( ScmInfo(url("https://github.com/sbt/zinc"), "git@github.com:sbt/zinc.git") ) @@ -77,13 +77,6 @@ ThisBuild / developers := List( Developer("jvican", "Jorge Vicente Cantero", "@jvican", url("https://github.com/jvican")), Developer("Duhemm", "Martin Duhem", "@Duhemm", url("https://github.com/Duhemm")), ) -ThisBuild / publishTo := { - val old = (ThisBuild / publishTo).value - sys.props.get("sbt.build.localmaven") match { - case Some(path) => Some(MavenCache("local-maven", file(path))) - case _ => old - } -} ThisBuild / pomIncludeRepository := (_ => false) // drop repos other than Maven Central from POM ThisBuild / mimaPreviousArtifacts := Set.empty // limit the number of concurrent test so testQuick works diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e9a2f2ee5f..06959b23d4 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,7 +2,8 @@ import sbt._, Keys._ import sbt.contraband.ContrabandPlugin.autoImport._ object Dependencies { - def nightlyVersion: Option[String] = sys.props.get("sbt.build.version") + def nightlyVersion: Option[String] = + sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version") val scala210 = "2.10.7" val scala211 = "2.11.12" diff --git a/project/HouseRulesPlugin.scala b/project/HouseRulesPlugin.scala index 8c8958c4f6..99a201df93 100644 --- a/project/HouseRulesPlugin.scala +++ b/project/HouseRulesPlugin.scala @@ -1,3 +1,5 @@ +package zincbuild + import sbt._ import Keys._ import bintray.BintrayPlugin @@ -12,7 +14,7 @@ object HouseRulesPlugin extends AutoPlugin { lazy val baseBuildSettings: Seq[Def.Setting[_]] = Seq( bintrayOrganization := Some("sbt"), - bintrayRepository := "maven-releases", + bintrayRepository := sys.env.get("BINTRAY_REPOSITORY").getOrElse("maven-releases"), ) lazy val baseSettings: Seq[Def.Setting[_]] = Seq(