luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6808 from eed3si9n/wip/lm 

[1.6.x] Make License object available
This commit is contained in:
eugene yokota 2022-01-31 22:47:04 -05:00 committed by GitHub
parent 611b8cf01b 761ad14267
commit 567fd8b60b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/Dependencies.scala
View File

@ -14,7 +14,7 @@ object Dependencies {
// sbt modules // sbt modules
private val ioVersion = nightlyVersion.getOrElse("1.6.0") private val ioVersion = nightlyVersion.getOrElse("1.6.0")
private val lmVersion = private val lmVersion =
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.6.0") sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.6.1")
val zincVersion = nightlyVersion.getOrElse("1.6.0") val zincVersion = nightlyVersion.getOrElse("1.6.0")
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion private val sbtIO = "org.scala-sbt" %% "io" % ioVersion

1
sbt-app/src/main/scala/sbt/Import.scala
View File

@ -297,6 +297,7 @@ trait Import {
type IvyScala = sbt.librarymanagement.ScalaModuleInfo type IvyScala = sbt.librarymanagement.ScalaModuleInfo
val JCenterRepository = sbt.librarymanagement.Resolver.JCenterRepository val JCenterRepository = sbt.librarymanagement.Resolver.JCenterRepository
val JavaNet2Repository = sbt.librarymanagement.Resolver.JavaNet2Repository val JavaNet2Repository = sbt.librarymanagement.Resolver.JavaNet2Repository
val License = sbt.librarymanagement.License
type LogicalClock = sbt.librarymanagement.LogicalClock type LogicalClock = sbt.librarymanagement.LogicalClock
val LogicalClock = sbt.librarymanagement.LogicalClock val LogicalClock = sbt.librarymanagement.LogicalClock
type MakePomConfiguration = sbt.librarymanagement.MakePomConfiguration type MakePomConfiguration = sbt.librarymanagement.MakePomConfiguration

1
sbt-app/src/sbt-test/dependency-management/artifact/build.sbt
View File

@ -11,6 +11,7 @@ ThisBuild / version := "0.1.0-SNAPSHOT"
ThisBuild / organization := "com.example" ThisBuild / organization := "com.example"
ThisBuild / organizationName := "example" ThisBuild / organizationName := "example"
ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache"
ThisBuild / licenses := List(License.Apache2)
lazy val Dev = config("dev").extend(Compile) lazy val Dev = config("dev").extend(Compile)
.describedAs("Dependencies required for development environments") .describedAs("Dependencies required for development environments")