Use Bintray for nightly

This commit is contained in:
Eugene Yokota 2020-11-15 00:58:52 -05:00
parent f8f9ed0c67
commit 349a4134e5
4 changed files with 34 additions and 42 deletions

View File

@ -7,9 +7,18 @@ val _ = {
sys.props += ("line.separator" -> "\n") sys.props += ("line.separator" -> "\n")
} }
ThisBuild / version := {
val old = (ThisBuild / version).value
nightlyVersion match {
case Some(v) => v
case _ =>
if ((ThisBuild / isSnapshot).value) "1.4.0-SNAPSHOT"
else old
}
}
ThisBuild / versionScheme := Some("early-semver") ThisBuild / versionScheme := Some("early-semver")
ThisBuild / organization := "org.scala-sbt" 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 / homepage := Some(url("https://github.com/sbt/librarymanagement"))
ThisBuild / description := "Library management module for sbt" ThisBuild / description := "Library management module for sbt"
ThisBuild / scmInfo := { ThisBuild / scmInfo := {
@ -238,11 +247,16 @@ lazy val lmCore = (project in file("core"))
exclude[ReversedMissingMethodProblem]( exclude[ReversedMissingMethodProblem](
"sbt.librarymanagement.MavenRepository.allowInsecureProtocol" "sbt.librarymanagement.MavenRepository.allowInsecureProtocol"
), ),
exclude[IncompatibleResultTypeProblem]("sbt.librarymanagement.ResolverFunctions.validateURLRepository"), exclude[IncompatibleResultTypeProblem](
exclude[IncompatibleResultTypeProblem]("sbt.librarymanagement.ResolverFunctions.validateMavenRepo"), "sbt.librarymanagement.ResolverFunctions.validateURLRepository"
exclude[IncompatibleResultTypeProblem]("sbt.librarymanagement.ResolverFunctions.validateArtifact"), ),
exclude[IncompatibleResultTypeProblem](
"sbt.librarymanagement.ResolverFunctions.validateMavenRepo"
),
exclude[IncompatibleResultTypeProblem](
"sbt.librarymanagement.ResolverFunctions.validateArtifact"
),
exclude[IncompatibleResultTypeProblem]("sbt.librarymanagement.*.validateProtocol"), exclude[IncompatibleResultTypeProblem]("sbt.librarymanagement.*.validateProtocol"),
), ),
) )
.configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache) .configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache)
@ -366,32 +380,6 @@ def customCommands: Seq[Setting[_]] = Seq(
} }
) )
ThisBuild / version := {
val old = (ThisBuild / version).value
nightlyVersion match {
case Some(v) => v
case _ =>
if ((ThisBuild / isSnapshot).value) "1.4.0-SNAPSHOT"
else old
}
}
def githubPackageRegistry: Option[Resolver] =
sys.env.get("RELEASE_GITHUB_PACKAGE_REGISTRY") map { repo =>
s"GitHub Package Registry ($repo)" at s"https://maven.pkg.github.com/$repo"
}
ThisBuild / publishTo := {
val old = (ThisBuild / publishTo).value
githubPackageRegistry orElse old
}
ThisBuild / resolvers ++= githubPackageRegistry.toList
ThisBuild / credentials ++= {
sys.env.get("GITHUB_TOKEN") match {
case Some(token) =>
List(Credentials("GitHub Package Registry", "maven.pkg.github.com", "unused", token))
case _ => Nil
}
}
inThisBuild( inThisBuild(
Seq( Seq(
whitesourceProduct := "Lightbend Reactive Platform", whitesourceProduct := "Lightbend Reactive Platform",

View File

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

View File

@ -1,3 +1,5 @@
package lmbuild
import sbt._ import sbt._
import Keys._ import Keys._
import bintray.BintrayPlugin import bintray.BintrayPlugin
@ -12,7 +14,7 @@ object HouseRulesPlugin extends AutoPlugin {
lazy val baseBuildSettings: Seq[Def.Setting[_]] = Seq( lazy val baseBuildSettings: Seq[Def.Setting[_]] = Seq(
bintrayOrganization := Some("sbt"), bintrayOrganization := Some("sbt"),
bintrayRepository := "maven-releases", bintrayRepository := sys.env.get("BINTRAY_REPOSITORY").getOrElse("maven-releases"),
) )
lazy val baseSettings: Seq[Def.Setting[_]] = Seq( lazy val baseSettings: Seq[Def.Setting[_]] = Seq(

View File

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