Make License object available

Fixes sbt#1937 Ref sbt/librarymanagement#395
eed3si9n · Feb 1, 2022 · 761ad14 · 761ad14
1 parent ca0fd3d
commit 761ad14
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -14,7 +14,7 @@ object Dependencies {
   // sbt modules
   private val ioVersion = nightlyVersion.getOrElse("1.6.0")
   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")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion

diff --git a/sbt-app/src/main/scala/sbt/Import.scala b/sbt-app/src/main/scala/sbt/Import.scala
@@ -297,6 +297,7 @@ trait Import {
   type IvyScala = sbt.librarymanagement.ScalaModuleInfo
   val JCenterRepository = sbt.librarymanagement.Resolver.JCenterRepository
   val JavaNet2Repository = sbt.librarymanagement.Resolver.JavaNet2Repository
+  val License = sbt.librarymanagement.License
   type LogicalClock = sbt.librarymanagement.LogicalClock
   val LogicalClock = sbt.librarymanagement.LogicalClock
   type MakePomConfiguration = sbt.librarymanagement.MakePomConfiguration

diff --git a/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt b/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt
@@ -11,6 +11,7 @@ ThisBuild / version          := "0.1.0-SNAPSHOT"
 ThisBuild / organization     := "com.example"
 ThisBuild / organizationName := "example"
 ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache"
+ThisBuild / licenses         := List(License.Apache2)
 
 lazy val Dev = config("dev").extend(Compile)
   .describedAs("Dependencies required for development environments")