Cross build to sbt 2.0.0-M3

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(

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.7

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)

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(_)

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,

src/main/scala/sbtbuildinfo/JavaRenderer.scala

@@ -40,6 +40,14 @@ abstract class JavaRenderer(pkg: String, cl: String, makeStatic: Boolean) extend
       |      return null;
       |    }
       |  }
+      |
+      |  private static java.net.URI internalAsUri(String uriString) {
+      |    try {
+      |      return new java.net.URI(uriString);
+      |    } catch (Exception e) {
+      |      return null;
+      |    }
+      |  }
       |""".stripMargin
 
   protected val buildMapLines: String =
@@ -152,6 +160,8 @@ 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("sbt.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
@@ -183,9 +193,10 @@ abstract class JavaRenderer(pkg: String, cl: String, makeStatic: Boolean) extend
             x0 <- tpeToReturnType(arg0)
             x1 <- tpeToReturnType(arg1)
           } yield s"java.util.Map.Entry<$x0, $x1>"
-        
+
         case TypeExpression("java.time.LocalDate", Nil) => Some("java.time.LocalDate")
         case TypeExpression("java.time.Instant", Nil) => Some("java.time.Instant")
+        case TypeExpression("sbt.librarymanagement.License", Nil) => Some("String")
 
         case _ =>
           // println(s"java other: $tpe")
@@ -208,6 +219,7 @@ abstract class JavaRenderer(pkg: String, cl: String, makeStatic: Boolean) extend
     case op: Option[_] =>
       op map { x => "java.util.Optional.of(" + quote(x) + ")" } getOrElse { "java.util.Optional.empty()" }
     case url: java.net.URL       => "internalAsUrl(%s)" format quote(url.toString)
+    case uri: java.net.URI       => "internalAsUri(%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)

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)

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

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

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

src/sbt-test/sbt-buildinfo/caseclassrenderer/build.sbt

@@ -51,8 +51,8 @@ lazy val root = (project in file("."))
           projectVer ::
           """  scalaVersion: String,""" ::
           """  ivyXML: scala.xml.NodeSeq,""" ::
-          """  homepage: scala.Option[java.net.URL],""" ::
-          """  licenses: scala.collection.immutable.Seq[(String, java.net.URL)],""" ::
+          homepageComment ::
+          homepageCode ::
           apiMappingsDecl ::
           """  isSnapshot: scala.Boolean,""" ::
           """  year: scala.Int,""" ::
@@ -107,8 +107,8 @@ lazy val root = (project in file("."))
           """    projectVersion = 0.1,""" ::
           """    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)),""" ::
+          homepage ::
+          licenses ::
           """    apiMappings = Map(),""" ::
           """    isSnapshot = false,""" ::
           """    year = 2012,""" ::
@@ -120,7 +120,7 @@ lazy val root = (project in file("."))
           """  val get = apply()""" ::
           """  val value = apply()""" ::
           """}""" ::
-          """// $COVERAGE-ON$""" :: Nil if (targetInfo contains "target = new java.io.File(") &&
+          """// $COVERAGE-ON$""" :: Nil if (targetInfo.contains("target = new java.io.File(")) &&
             (apiMappingsDecl.contains("apiMappings")) =>
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }

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

src/sbt-test/sbt-buildinfo/constantvalue/build.sbt

@@ -57,10 +57,10 @@ lazy val root = (project in file(".")).
           scalaVersionInfo ::
           """  /** The value is scala.xml.NodeSeq.Empty. */""" ::
           """  val ivyXML: scala.xml.NodeSeq = scala.xml.NodeSeq.Empty""" ::
-          """  /** The value is scala.Some(new java.net.URI("http://example.com").toURL). */""" ::
-          """  val homepage: scala.Option[java.net.URL] = scala.Some(new java.net.URI("http://example.com").toURL)""" ::
-          """  /** The value is scala.collection.immutable.Seq(("MIT License" -> new java.net.URI("https://github.com/sbt/sbt-buildinfo/blob/master/LICENSE").toURL)). */""" ::
-          """  val licenses: scala.collection.immutable.Seq[(String, java.net.URL)] = scala.collection.immutable.Seq(("MIT License" -> new java.net.URI("https://github.com/sbt/sbt-buildinfo/blob/master/LICENSE").toURL))""" ::
+          homepageComment ::
+          homepageCode ::
+          licenseComment ::
+          licenseCode ::
           """  /** The value is Map(). */""" ::
           apiMappingsCode ::
           """  /** The value is false. */""" ::
@@ -85,8 +85,8 @@ lazy val root = (project in file(".")).
           """    )""" ::
           """  }""" ::
           """}""" ::
-          """// $COVERAGE-ON$""" :: Nil  if (targetInfo contains "target: java.io.File = new java.io.File(") &&
-          (scalaVersionInfo.trim == s"""final val scalaVersion = "$sv"""") => ()
+          """// $COVERAGE-ON$""" :: Nil  if targetInfo.contains("target: java.io.File = new java.io.File(") &&
+            (scalaVersionInfo.trim == s"""final val scalaVersion = "$sv"""") => ()
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }
       ()

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

src/sbt-test/sbt-buildinfo/javasingletonrenderer/build.sbt

@@ -53,10 +53,10 @@ lazy val root = (project in file("."))
           """  public final String name = "helloworld";""" ::
           """  /** The value is "2.12.12". */""" ::
           """  public final String scalaVersion = "2.12.12";""" ::
-          """  /** The value is java.util.Optional.of(internalAsUrl("http://example.com")). */""" ::
-          """  public final java.util.Optional<java.net.URL> homepage = java.util.Optional.of(internalAsUrl("http://example.com"));""" ::
-          """  /** The value is java.util.Collections.unmodifiableList(java.util.Arrays.asList(new java.util.AbstractMap.SimpleImmutableEntry<>("MIT License", internalAsUrl("https://github.com/sbt/sbt-buildinfo/blob/master/LICENSE")))). */""" ::
-          """  public final java.util.Collection<java.util.Map.Entry<String, java.net.URL>> licenses = java.util.Collections.unmodifiableList(java.util.Arrays.asList(new java.util.AbstractMap.SimpleImmutableEntry<>("MIT License", internalAsUrl("https://github.com/sbt/sbt-buildinfo/blob/master/LICENSE"))));""" ::
+          homepageComment ::
+          homepageCode ::
+          licensesComment ::
+          licensesCode ::
           """  /** The value is internalAsMap(). */""" ::
           apiMappingsCode ::
           """  /** The value is false. */""" ::
@@ -105,6 +105,14 @@ lazy val root = (project in file("."))
           """    }""" ::
           """  }""" ::
           """""" ::
+          """  private static java.net.URI internalAsUri(String uriString) {""" ::
+          """    try {""" ::
+          """      return new java.net.URI(uriString);""" ::
+          """    } catch (Exception e) {""" ::
+          """      return null;""" ::
+          """    }""" ::
+          """  }""" ::
+          """""" ::
           """  @SuppressWarnings({"unchecked", "rawtypes"})""" ::
           """  private static <K, V> java.util.Map<K, V> internalAsMap(java.util.Map.Entry... entries) {""" ::
           """    java.util.Map<K, V> m = new java.util.HashMap<>();""" ::
@@ -151,7 +159,8 @@ lazy val root = (project in file("."))
           """""" ::
           """  public final String toJson = toJsonValue(toMap());""" ::
           """}""" ::
-          """// $COVERAGE-ON$""" :: Nil if ((targetInfo contains "public final java.io.File target = new java.io.File(") && (targetInfoComment contains "/** The value is new java.io.File(")) =>
+          """// $COVERAGE-ON$""" :: Nil if targetInfo.contains("target = new java.io.File(") &&
+            targetInfoComment.contains("/** The value is new java.io.File(") => ()
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }
       ()

src/sbt-test/sbt-buildinfo/javasingletonrenderer/test

@@ -1,4 +1,5 @@
 > compile
-# $ exists target/src_managed/main/sbt-buildinfo/BuildInfo.java
+# > show Compile/sources
+# $ exists target/**/src_managed/main/sbt-buildinfo/BuildInfo.java
 
 > check

src/sbt-test/sbt-buildinfo/javastaticfieldsrenderer/build.sbt

@@ -51,10 +51,10 @@ lazy val root = (project in file("."))
           """  public static final String name = "helloworld";""" ::
           """  /** The value is "2.12.12". */""" ::
           """  public static final String scalaVersion = "2.12.12";""" ::
-          """  /** The value is java.util.Optional.of(internalAsUrl("http://example.com")). */""" ::
-          """  public static final java.util.Optional<java.net.URL> homepage = java.util.Optional.of(internalAsUrl("http://example.com"));""" ::
-          """  /** The value is java.util.Collections.unmodifiableList(java.util.Arrays.asList(new java.util.AbstractMap.SimpleImmutableEntry<>("MIT License", internalAsUrl("https://github.com/sbt/sbt-buildinfo/blob/master/LICENSE")))). */""" ::
-          """  public static final java.util.Collection<java.util.Map.Entry<String, java.net.URL>> licenses = java.util.Collections.unmodifiableList(java.util.Arrays.asList(new java.util.AbstractMap.SimpleImmutableEntry<>("MIT License", internalAsUrl("https://github.com/sbt/sbt-buildinfo/blob/master/LICENSE"))));""" ::
+          homepageComment ::
+          homepageCode ::
+          licensesComment ::
+          licensesCode ::
           """  /** The value is internalAsMap(). */""" ::
           apiMappingsCode ::
           """  /** The value is false. */""" ::
@@ -103,6 +103,14 @@ lazy val root = (project in file("."))
           """    }""" ::
           """  }""" ::
           """""" ::
+          """  private static java.net.URI internalAsUri(String uriString) {""" ::
+          """    try {""" ::
+          """      return new java.net.URI(uriString);""" ::
+          """    } catch (Exception e) {""" ::
+          """      return null;""" ::
+          """    }""" ::
+          """  }""" ::
+          """""" ::
           """  @SuppressWarnings({"unchecked", "rawtypes"})""" ::
           """  private static <K, V> java.util.Map<K, V> internalAsMap(java.util.Map.Entry... entries) {""" ::
           """    java.util.Map<K, V> m = new java.util.HashMap<>();""" ::
@@ -149,7 +157,8 @@ lazy val root = (project in file("."))
           """""" ::
           """  public static final String makeJson = toJsonValue(makeMap());""" ::
           """}""" ::
-          """// $COVERAGE-ON$""" :: Nil if ((targetInfo contains "public static final java.io.File target = new java.io.File(") && (targetInfoComment contains "/** The value is new java.io.File(")) =>
+          """// $COVERAGE-ON$""" :: Nil if targetInfo.contains("target = new java.io.File(") &&
+            targetInfoComment.contains("/** The value is new java.io.File(") => ()
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }
       ()

src/sbt-test/sbt-buildinfo/multi/build.sbt

@@ -39,7 +39,7 @@ lazy val app = (project in file("app"))
              projectIdCode :: // project id changed in sbt 2.x
              """  /** The value is "0.1". */""" ::
              """  val version: String = "0.1"""" ::
-             """  /** The value is new java.net.URI("http://example.com").toURL. */""" ::
+             homepageComment ::
              homepageCode ::
              scalaVersionInfoComment ::
              scalaVersionInfo ::

src/sbt-test/sbt-buildinfo/simple/build.sbt

@@ -57,9 +57,9 @@ lazy val root = (project in file("."))
              scalaVersionInfo ::
              """  /** The value is scala.xml.NodeSeq.Empty. */""" ::
              """  val ivyXML: scala.xml.NodeSeq = scala.xml.NodeSeq.Empty""" ::
-             """  /** The value is scala.Some(new java.net.URI("http://example.com").toURL). */""" ::
-             """  val homepage: scala.Option[java.net.URL] = scala.Some(new java.net.URI("http://example.com").toURL)""" ::
-             """  /** The value is scala.collection.immutable.Seq(("MIT License" -> new java.net.URI("https://github.com/sbt/sbt-buildinfo/blob/master/LICENSE").toURL)). */""" ::
+             homepageComment ::
+             homepageCode ::
+             licenseComment ::
              licensesCode ::
              """  /** The value is Map(). */""" ::
              apiMappingsCode ::
@@ -83,10 +83,10 @@ lazy val root = (project in file("."))
              """    )""" ::
              """  }""" ::
              """}""" ::
-             """// $COVERAGE-ON$""" :: Nil if (targetInfo contains "val target: java.io.File = new java.io.File(") &&
-             (scalaVersionInfo.trim == s"""val scalaVersion: String = "$sv"""") &&
-             (someCpInfo.contains("/tmp/f.txt")) &&
-             (projectVer.contains("val projectVersion")) => ()
+             """// $COVERAGE-ON$""" :: Nil if targetInfo.contains("target: java.io.File = new java.io.File(") &&
+               (scalaVersionInfo.trim == s"""val scalaVersion: String = "$sv"""") &&
+               (someCpInfo.contains("/tmp/f.txt")) &&
+               (projectVer.contains("val projectVersion")) => ()
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }
       ()

src/sbt-test/sbt-buildinfo/skipimportscaseclass/build.sbt

@@ -45,8 +45,8 @@ lazy val root = (project in file("."))
           """  name: String,""" ::
           """  scalaVersion: String,""" ::
           """  ivyXML: scala.xml.NodeSeq,""" ::
-          """  homepage: scala.Option[java.net.URL],""" ::
-          """  licenses: scala.collection.immutable.Seq[(String, java.net.URL)],""" ::
+          homagepageCode ::
+          licensesCode ::
           apiMappingsCode ::
           """  isSnapshot: scala.Boolean,""" ::
           """  year: scala.Int,""" ::
@@ -95,8 +95,8 @@ lazy val root = (project in file("."))
           """    name = "helloworld",""" ::
           """    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)),""" ::
+          homagepageApply ::
+          licensesApply ::
           """    apiMappings = Map(),""" ::
           """    isSnapshot = false,""" ::
           """    year = 2012,""" ::
@@ -106,7 +106,7 @@ lazy val root = (project in file("."))
           """  val get = apply()""" ::
           """  val value = apply()""" ::
           """}""" ::
-          """// $COVERAGE-ON$""" :: Nil if (targetInfo contains "target = new java.io.File(") =>
+          """// $COVERAGE-ON$""" :: Nil if targetInfo.contains("target = new java.io.File(") => ()
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }
       ()

src/sbt-test/sbt-buildinfo/skipimportscaseclass/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

src/sbt-test/sbt-buildinfo/skipimportscaseobject/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