Merge pull request #346 from sbt/wip/nightly

Use Bintray for nightly

build.sbt

@@ -18,7 +18,7 @@ ThisBuild / version := {
 }
 ThisBuild / versionScheme := Some("early-semver")
 ThisBuild / organization := "org.scala-sbt"
-ThisBuild / bintrayPackage := "librarymanagement"
+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 := {
@@ -247,11 +247,16 @@ lazy val lmCore = (project in file("core"))
       exclude[ReversedMissingMethodProblem](
         "sbt.librarymanagement.MavenRepository.allowInsecureProtocol"
       ),
-      exclude[IncompatibleResultTypeProblem]("sbt.librarymanagement.ResolverFunctions.validateURLRepository"),
-      exclude[IncompatibleResultTypeProblem]("sbt.librarymanagement.ResolverFunctions.validateMavenRepo"),
-      exclude[IncompatibleResultTypeProblem]("sbt.librarymanagement.ResolverFunctions.validateArtifact"),
+      exclude[IncompatibleResultTypeProblem](
+        "sbt.librarymanagement.ResolverFunctions.validateURLRepository"
+      ),
+      exclude[IncompatibleResultTypeProblem](
+        "sbt.librarymanagement.ResolverFunctions.validateMavenRepo"
+      ),
+      exclude[IncompatibleResultTypeProblem](
+        "sbt.librarymanagement.ResolverFunctions.validateArtifact"
+      ),
       exclude[IncompatibleResultTypeProblem]("sbt.librarymanagement.*.validateProtocol"),
-
     ),
   )
   .configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache)
@@ -375,14 +380,6 @@ def customCommands: Seq[Setting[_]] = Seq(
   }
 )
 
-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
-  }
-}
-
 inThisBuild(
   Seq(
     whitesourceProduct := "Lightbend Reactive Platform",

project/DatatypeConfig.scala

@@ -44,12 +44,12 @@ object DatatypeConfig {
 
     case "sbt.librarymanagement.CrossVersion" => { _ =>
       "sbt.librarymanagement.CrossVersionFormats" ::
-      "sbt.librarymanagement.DisabledFormats" ::
-      "sbt.librarymanagement.BinaryFormats" ::
-      "sbt.librarymanagement.ConstantFormats" ::
-      "sbt.librarymanagement.PatchFormats" ::
-      "sbt.librarymanagement.FullFormats" ::
-      Nil
+        "sbt.librarymanagement.DisabledFormats" ::
+        "sbt.librarymanagement.BinaryFormats" ::
+        "sbt.librarymanagement.ConstantFormats" ::
+        "sbt.librarymanagement.PatchFormats" ::
+        "sbt.librarymanagement.FullFormats" ::
+        Nil
     }
 
     // TODO: These are handled by BasicJsonProtocol, and sbt-datatype should handle them by default, imo

project/Dependencies.scala

@@ -5,7 +5,8 @@ import sbt.contraband.ContrabandPlugin.autoImport._
 object Dependencies {
   val scala212 = "2.12.10"
 
-  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")
 
   private val ioVersion = nightlyVersion.getOrElse("1.4.0")
   private val utilVersion = nightlyVersion.getOrElse("1.4.0")

project/HouseRulesPlugin.scala

@@ -1,3 +1,5 @@
+package lmbuild
+
 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(

project/Util.scala

@@ -16,10 +16,12 @@ object Util {
     lastCompilation.map(_.getStartTime) getOrElse 0L
   }
 
-  def generateVersionFile(version: String,
-                          dir: File,
-                          s: TaskStreams,
-                          analysis: CompileAnalysis): Seq[File] = {
+  def generateVersionFile(
+      version: String,
+      dir: File,
+      s: TaskStreams,
+      analysis: CompileAnalysis
+  ): Seq[File] = {
     import java.util.{ Date, TimeZone }
     val formatter = new java.text.SimpleDateFormat("yyyyMMdd'T'HHmmss")
     formatter.setTimeZone(TimeZone.getTimeZone("GMT"))

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.0-RC2
+sbt.version=1.4.2