Merge pull request #476 from alejandrohdezma/update/sbt-header-5.8.0

Update sbt-header to 5.8.0

modules/sbt-github-header/src/main/scala/com/alejandrohdezma/sbt/github/sbtheader/SbtGithubHeaderPlugin.scala

@@ -16,6 +16,8 @@
 
 package com.alejandrohdezma.sbt.github.sbtheader
 
+import scala.collection.breakOut
+
 import sbt.Def
 import sbt.Keys._
 import sbt._
@@ -24,7 +26,8 @@ import com.alejandrohdezma.sbt.github.SbtGithubPlugin
 import com.alejandrohdezma.sbt.github.SbtGithubPlugin.autoImport._
 import de.heikoseeberger.sbtheader.HeaderPlugin
 import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
-import de.heikoseeberger.sbtheader.LicenseDetection
+import de.heikoseeberger.sbtheader.License._
+import de.heikoseeberger.sbtheader.SpdxLicense
 
 /** Populates the `headerLicense` setting from [[https://github.com/sbt/sbt-header sbt-header]] with values extracted
   * from Github by `SbtGithubPlugin`:
@@ -54,14 +57,26 @@ object SbtGithubHeaderPlugin extends AutoPlugin {
 
   override def requires: Plugins = HeaderPlugin && SbtGithubPlugin
 
+  private val spdxMapping =
+    Vector(
+      ALv2, MIT, MPLv2, BSD2Clause, BSD3Clause, GPLv3OrLater, GPLv3Only, GPLv3, LGPLv3OrLater, LGPLv3Only, LGPLv3,
+      AGPLv3OrLater, AGPLv3Only, AGPLv3
+    ).map(l => (l.spdxIdentifier, l))(breakOut): Map[String, SpdxLicense]
+
   override def projectSettings: Seq[Def.Setting[_]] =
     Seq(
-      headerLicense := LicenseDetection(
-        licenses.value.toList,
-        copyrightOwner.value,
-        yearRange.value,
-        headerLicenseStyle.value
-      ),
+      headerLicense := {
+        val licenseName = licenses.value match {
+          case (name, _) :: Nil => Some(name)
+          case _                => None
+        }
+
+        for {
+          name    <- licenseName
+          license <- spdxMapping.get(name)
+          year    <- yearRange.value
+        } yield license(year, copyrightOwner.value, headerLicenseStyle.value)
+      },
       copyrightOwner := {
         organizationHomepage.value
           .map(url => s"${organizationName.value} <$url>")

modules/sbt-github-header/src/sbt-test/sbt-github-header/create-apache-headers-with-downloaded-info/build.sbt

@@ -1,7 +1,7 @@
 // Disable sbt-github downloading so we don't rely in API
 ThisBuild / githubEnabled := false
 
-ThisBuild / licenses         += "Apache-2.0" -> url("http://localhost")
-ThisBuild / yearRange        := Some("2015-2020")
+ThisBuild / licenses += "Apache-2.0" -> url("http://localhost")
+ThisBuild / yearRange := Some("2015-2020")
 
-copyrightOwner   := "My Company"
+copyrightOwner := "My Company"

modules/sbt-github-header/src/sbt-test/sbt-github-header/create-apache-headers-with-downloaded-info/project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.7.0")
+addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.8.0")
 addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % sys.props("plugin.version"))

modules/sbt-github-header/src/sbt-test/sbt-github-header/fail-if-no-license/project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.7.0")
+addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.8.0")
 addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % sys.props("plugin.version"))

modules/sbt-github-header/src/sbt-test/sbt-github-header/fail-if-no-year-range/project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.7.0")
+addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.8.0")
 addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % sys.props("plugin.version"))

modules/sbt-github-header/src/sbt-test/sbt-github-header/fail-if-unable-to-infer-license/project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.7.0")
+addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.8.0")
 addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % sys.props("plugin.version"))

modules/sbt-github-header/src/sbt-test/sbt-github-header/use-organization-name-and-homepage-as-copyright-owner/build.sbt

@@ -1,8 +1,8 @@
 // Disable sbt-github downloading so we don't rely in API
 ThisBuild / githubEnabled := false
 
-ThisBuild / licenses         += "MIT" -> url("http://localhost")
-ThisBuild / yearRange        := Some("2015-2020")
+ThisBuild / licenses += "MIT" -> url("http://localhost")
+ThisBuild / yearRange := Some("2015-2020")
 
 organizationName := "My Company"
 organizationHomepage := Some(url("http://example.com"))

modules/sbt-github-header/src/sbt-test/sbt-github-header/use-organization-name-and-homepage-as-copyright-owner/project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.7.0")
+addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.8.0")
 addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % sys.props("plugin.version"))

modules/sbt-github-header/src/sbt-test/sbt-github-header/use-organization-name-as-copyright-owner/project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.7.0")
+addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.8.0")
 addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % sys.props("plugin.version"))

project/plugins.sbt

@@ -1,12 +1,12 @@
-addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix"             % "0.10.4")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-fix"                  % "0.7.0")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-ci"                   % "2.7.1")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-scalafmt-defaults"    % "0.7.1")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-scalafix-defaults"    % "0.9.1")
-addSbtPlugin("com.github.sbt"            % "sbt-ci-release"           % "1.5.11")
-addSbtPlugin("de.heikoseeberger"         % "sbt-header"               % "5.7.0")
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"             % "0.4.1")
-addSbtPlugin("org.scalameta"             % "sbt-mdoc"                 % "2.3.6")
-addSbtPlugin("org.scalameta"             % "sbt-scalafmt"             % "2.4.6")
-addSbtPlugin("io.kevinlee"               % "sbt-github-pages"         % "0.11.0")
-addSbtPlugin("com.alejandrohdezma"       % "sbt-modules"              % "0.2.0")
+addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix"          % "0.10.4")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-fix"               % "0.7.0")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-ci"                % "2.7.1")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-scalafmt-defaults" % "0.7.1")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-scalafix-defaults" % "0.9.1")
+addSbtPlugin("com.github.sbt"            % "sbt-ci-release"        % "1.5.11")
+addSbtPlugin("de.heikoseeberger"         % "sbt-header"            % "5.8.0")
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"          % "0.4.1")
+addSbtPlugin("org.scalameta"             % "sbt-mdoc"              % "2.3.6")
+addSbtPlugin("org.scalameta"             % "sbt-scalafmt"          % "2.4.6")
+addSbtPlugin("io.kevinlee"               % "sbt-github-pages"      % "0.11.0")
+addSbtPlugin("com.alejandrohdezma"       % "sbt-modules"           % "0.2.0")