From 8bf9ecaba363bad3cb9485f664c7326dbe6aede7 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 5 Dec 2024 01:00:06 -0500 Subject: [PATCH] Add conversion for backward compatibility --- .../sbt/librarymanagement/LibraryManagementSyntax.scala | 5 +++++ .../src/sbt-test/dependency-management/artifact/build.sbt | 1 + 2 files changed, 6 insertions(+) diff --git a/lm-core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala b/lm-core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala index 1ab5629d7..8ffed65f5 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/LibraryManagementSyntax.scala @@ -1,5 +1,7 @@ package sbt.librarymanagement +import java.net.URI + trait LibraryManagementSyntax0 { // See http://www.scala-lang.org/news/2.12.0#traits-compile-to-interfaces // Avoid defining fields (val or var, but a constant is ok – final val without result type) @@ -35,6 +37,9 @@ trait LibraryManagementSyntax // java.lang.System is more important, so don't alias this one // final val System = C.System final val Optional = C.Optional + + given Conversion[(String, URI), License] with + def apply(x: (String, URI)): License = License(x._1, x._2) } object syntax extends LibraryManagementSyntax diff --git a/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt b/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt index 42118a035..208ef36c2 100644 --- 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 / organization := "com.example" ThisBuild / organizationName := "example" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" ThisBuild / licenses += License.Apache2 +ThisBuild / licenses += ("foo", uri("https://example.com/")) lazy val Dev = config("dev").extend(Compile) .describedAs("Dependencies required for development environments")