Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ lazy val lang3 = "org.apache.commons" % "commons-text" % "1.12.0"
lazy val repoSlug = "sbt/sbt-license-report"

val scala212 = "2.12.20"
val scala3 = "3.6.2"
val scala3 = "3.7.2"

pluginCrossBuild / sbtVersion := {
scalaBinaryVersion.value match {
case "2.12" =>
(pluginCrossBuild / sbtVersion).value
case _ =>
"2.0.0-M3"
"2.0.0-RC3"
}
}

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.7
sbt.version=1.11.4
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package sbtlicensereport

private[sbtlicensereport] object SbtLicenseReportCompat {
implicit class DefOps(private val self: sbt.Def.type) extends AnyVal {
def uncached[A](a: A): A = a
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package sbtlicensereport

private[sbtlicensereport] object SbtLicenseReportCompat
13 changes: 7 additions & 6 deletions src/main/scala/sbtlicensereport/SbtLicenseReport.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package sbtlicensereport

import sbt._
import sbtlicensereport.SbtLicenseReportCompat._
import Keys._
import license._

Expand Down Expand Up @@ -80,7 +81,7 @@ object SbtLicenseReport extends AutoPlugin {
override lazy val projectSettings: Seq[Setting[_]] =
Seq(
licenseReportTitle := s"${normalizedName.value}-licenses",
updateLicenses := {
updateLicenses := Def.uncached {
if (VersionNumber(sbtVersion.value).matchesSemVer(SemanticSelector("<1.10.5")))
throw new sbt.MessageOnlyException("sbt-license-report requires sbt 1.10.5 or greater.")
val overrides = licenseOverrides.value.lift
Expand All @@ -100,7 +101,7 @@ object SbtLicenseReport extends AutoPlugin {
licenseReportMakeHeader := (language => language.header1(licenseReportTitle.value)),
// TODO - Maybe we need a general purpose reporting directory
licenseReportDir := target.value / "license-reports",
licenseReportConfigurations := {
licenseReportConfigurations := Def.uncached {
val dir = licenseReportDir.value
val styleRules = licenseReportStyleRules.value
// TODO - Configurable language (markdown/html/csv) rather than all always
Expand All @@ -118,28 +119,28 @@ object SbtLicenseReport extends AutoPlugin {
)
Seq(config)
},
dumpLicenseReport := {
dumpLicenseReport := Def.uncached {
val report = updateLicenses.value
val dir = licenseReportDir.value
for (config <- licenseReportConfigurations.value)
LicenseReport.dumpLicenseReport(report.licenses, config)
dir
},
dumpLicenseReportAggregate := {
dumpLicenseReportAggregate := Def.uncached {
val reports = aggregateUpdateLicenses.value
val dir = licenseReportDir.value
for (config <- licenseReportConfigurations.value)
LicenseReport.dumpLicenseReport(reports.flatMap(_.licenses), config)
dir
},
dumpLicenseReportAnyProject := {
dumpLicenseReportAnyProject := Def.uncached {
val reports = anyProjectUpdateLicenses.value
val dir = licenseReportDir.value
for (config <- licenseReportConfigurations.value)
LicenseReport.dumpLicenseReport(reports.flatMap(_.licenses), config)
dir
},
licenseCheck := {
licenseCheck := Def.uncached {
val log = streams.value.log
val report = updateLicenses.value
val allowed = licenseCheckAllow.value
Expand Down
Loading