Merge remote-tracking branch 'origin/2.12.x' into merge-2.12.x-to-2.13.x-20221031

SethTisue · SethTisue · commit 3d6819b1e25e · 2022-10-31T20:13:40.000+01:00
diff --git a/project/Osgi.scala b/project/Osgi.scala
@@ -3,7 +3,7 @@ package scala.build
 import aQute.bnd.osgi.Builder
 import aQute.bnd.osgi.Constants._
 import java.util.jar.Attributes
-import sbt._
+import sbt.{License => _, _}
 import sbt.Keys._
 import collection.JavaConverters._
 import VersionUtil.versionProperties
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.7.3
