Cross build to sbt 2.0.0-M3

sbt · Dec 26, 2024 · 7c1f840 · 7c1f840
1 parent 07337b5
commit 7c1f840
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 16 deletions.
diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ ThisBuild / version := {
   if (orig.endsWith("-SNAPSHOT")) "0.11.0-SNAPSHOT"
   else orig
 }
-val scala3 = "3.3.4"
+val scala3 = "3.6.2"
 ThisBuild / scalaVersion := scala3
 
 lazy val root = (project in file("."))
@@ -32,9 +32,15 @@ lazy val root = (project in file("."))
     (pluginCrossBuild / sbtVersion) := {
       scalaBinaryVersion.value match {
         case "2.12" => "1.5.8"
-        case _      => "2.0.0-M2"
+        case _      => "2.0.0-M3"
       }
-    }
+    },
+    scriptedSbt := {
+      scalaBinaryVersion.value match {
+        case "2.12" => "1.10.7"
+        case _      => "2.0.0-M3"
+      }
+    },
   )
 
 ThisBuild / scmInfo := Some(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.7
diff --git a/src/main/scala-2.12/sbtbuildinfo/PluginCompat.scala b/src/main/scala-2.12/sbtbuildinfo/PluginCompat.scala
@@ -34,6 +34,9 @@ object PluginCompat {
   def toClasspath(cp: Vector[NioPath]): Seq[Attributed[File]] =
     cp.map((x) => Attributed.blank(x.toFile()))
 
+  def taskName(task: Task[?]): Option[String] = task.info.name
+  def taskAttributes(task: Task[?]) = task.info.attributes
+
   implicit class RichScope(scope: Scope) {
     @nowarn
     def rescope(ref: Reference): Scope = scope.in(ref)

diff --git a/src/main/scala-3/sbtbuildinfo/PluginCompat.scala b/src/main/scala-3/sbtbuildinfo/PluginCompat.scala
@@ -23,6 +23,9 @@ object PluginCompat:
   def toClasspath(cp: Vector[NioPath])(using conv: FileConverter): Seq[Attributed[HashedVirtualFileRef]] =
     cp.map((x) => Attributed.blank(conv.toVirtualFile(x)))
 
+  def taskName(task: Task[?]): Option[String] = task.name
+  def taskAttributes(task: Task[?]) = task.attributes
+
   trait BuildInfoKeys0:
     @nowarn inline given [A1]: Conversion[SettingKey[A1], Entry[A1]] = BuildInfoKey(_)
     @nowarn inline given [A1]: Conversion[TaskKey[A1], Entry[A1]] = BuildInfoKey(_)

diff --git a/src/main/scala/sbtbuildinfo/BuildInfo.scala b/src/main/scala/sbtbuildinfo/BuildInfo.scala
@@ -73,12 +73,13 @@ object BuildInfo {
     Seq(config, inTask, Some(key)).flatten mkString "_"
   }
 
-  private def ident(task: Task[_]): String = (
-    task.info.name
-      orElse (task.info.attributes get taskDefinitionKey map ident)
-      getOrElse s"<anon-${System identityHashCode task}>"
-  )
-
+  private def ident(task: Task[_]): String =
+    taskName(task) match {
+      case Some(name) => name
+      case None =>
+        (taskAttributes(task) get taskDefinitionKey map ident)
+        .getOrElse(s"<anon-${System identityHashCode task}>")
+    }
 
   private case class BuildInfoTask(dir: File,
                                    renderer: BuildInfoRenderer,

diff --git a/src/main/scala/sbtbuildinfo/JavaRenderer.scala b/src/main/scala/sbtbuildinfo/JavaRenderer.scala
@@ -152,6 +152,7 @@ abstract class JavaRenderer(pkg: String, cl: String, makeStatic: Boolean) extend
         case TypeExpression("java.lang.String", Nil)  => Some("String")
         case TypeExpression("java.net.URL", Nil)      => Some("java.net.URL")
         case TypeExpression("sbt.URL", Nil)           => Some("java.net.URL")
+        case TypeExpression("java.net.URI", Nil)      => Some("java.net.URI")
         case TypeExpression("java.io.File", Nil)      => Some("java.io.File")
         case TypeExpression("sbt.File", Nil)          => Some("java.io.File")
         case TypeExpression("scala.xml.NodeSeq", Nil) => None

diff --git a/src/main/scala/sbtbuildinfo/ScalaRenderer.scala b/src/main/scala/sbtbuildinfo/ScalaRenderer.scala
@@ -54,6 +54,7 @@ abstract class ScalaRenderer extends BuildInfoRenderer {
         case TypeExpression("java.lang.String", Nil) => Some("String")
         case TypeExpression("java.net.URL", Nil) => Some("java.net.URL")
         case TypeExpression("sbt.URL", Nil) => Some("java.net.URL")
+        case TypeExpression("java.net.URI", Nil) => Some("java.net.URI")
         case TypeExpression("java.io.File", Nil) => Some("java.io.File")
         case TypeExpression("sbt.File", Nil) => Some("java.io.File")
         case TypeExpression("scala.xml.NodeSeq", Nil) => Some("scala.xml.NodeSeq")
@@ -106,6 +107,7 @@ abstract class ScalaRenderer extends BuildInfoRenderer {
     case seq: collection.Seq[_] => seq.map(quote).mkString("scala.collection.immutable.Seq(", ", ", ")")
     case op: Option[_]      => op map { x => "scala.Some(" + quote(x) + ")" } getOrElse {"scala.None"}
     case url: java.net.URL  => "new java.net.URI(%s).toURL" format quote(url.toString)
+    case uri: java.net.URI  => "new java.net.URI(%s)" format quote(uri.toString)
     case file: java.io.File => "new java.io.File(%s)" format quote(file.toString)
     case attr: sbt.Attributed[_] => quote(attr.data)
     case date: java.time.LocalDate  => "java.time.LocalDate.parse(%s)" format quote(date.toString)

diff --git a/src/sbt-test/sbt-buildinfo/append/test b/src/sbt-test/sbt-buildinfo/append/test
@@ -1,4 +1,4 @@
 > compile
-# $ exists target/scala-2.12/src_managed/main/sbt-buildinfo/BuildInfo.scala
+$ exists target/**/src_managed/main/sbt-buildinfo/BuildInfo.scala
 
 > check
diff --git a/src/sbt-test/sbt-buildinfo/buildtime/test b/src/sbt-test/sbt-buildinfo/buildtime/test
@@ -1,4 +1,4 @@
 > compile
-# $ exists target/scala-2.12/src_managed/main/sbt-buildinfo/BuildInfo.scala
+$ exists target/**/src_managed/main/sbt-buildinfo/BuildInfo.scala
 
 > check
diff --git a/src/sbt-test/sbt-buildinfo/caching/test b/src/sbt-test/sbt-buildinfo/caching/test
@@ -1,5 +1,5 @@
 > compile
-# $ exists target/scala-2.12/src_managed/main/sbt-buildinfo/BuildInfo.scala
+$ exists target/**/src_managed/main/sbt-buildinfo/BuildInfo.scala
 > check
 # $ copy-file target/scala-2.12/src_managed/main/sbt-buildinfo/BuildInfo.scala target/BuildInfo.scala
 > compile

diff --git a/src/sbt-test/sbt-buildinfo/caseclassrenderer/build.sbt b/src/sbt-test/sbt-buildinfo/caseclassrenderer/build.sbt
@@ -108,7 +108,7 @@ lazy val root = (project in file("."))
           """    scalaVersion = "2.12.12",""" ::
           """    ivyXML = scala.xml.NodeSeq.Empty,""" ::
           """    homepage = scala.Some(new java.net.URI("http://example.com").toURL),""" ::
-          """    licenses = scala.collection.immutable.Seq(("MIT License" -> new java.net.URI("https://github.com/sbt/sbt-buildinfo/blob/master/LICENSE").toURL)),""" ::
+          licenses ::
           """    apiMappings = Map(),""" ::
           """    isSnapshot = false,""" ::
           """    year = 2012,""" ::

diff --git a/src/sbt-test/sbt-buildinfo/caseclassrenderer/test b/src/sbt-test/sbt-buildinfo/caseclassrenderer/test
@@ -1,4 +1,4 @@
 > compile
-# $ exists target/scala-2.12/src_managed/main/sbt-buildinfo/BuildInfo.scala
+$ exists target/**/src_managed/main/sbt-buildinfo/BuildInfo.scala
 
 > check
diff --git a/src/sbt-test/sbt-buildinfo/constantvalue/test b/src/sbt-test/sbt-buildinfo/constantvalue/test
@@ -1,4 +1,4 @@
 > compile
-# $ exists target/scala-2.13/src_managed/main/sbt-buildinfo/BuildInfo.scala
+$ exists target/**/src_managed/main/sbt-buildinfo/BuildInfo.scala
 
 > check