Skip to content

Commit c173fd7

Browse files
committed
sbt 2.0.0-RC3
1 parent 2dce5f4 commit c173fd7

File tree

5 files changed

+24
-10
lines changed

5 files changed

+24
-10
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ lazy val lang3 = "org.apache.commons" % "commons-text" % "1.12.0"
22
lazy val repoSlug = "sbt/sbt-license-report"
33

44
val scala212 = "2.12.20"
5-
val scala3 = "3.6.2"
5+
val scala3 = "3.7.2"
66

77
pluginCrossBuild / sbtVersion := {
88
scalaBinaryVersion.value match {
99
case "2.12" =>
1010
(pluginCrossBuild / sbtVersion).value
1111
case _ =>
12-
"2.0.0-M3"
12+
"2.0.0-RC3"
1313
}
1414
}
1515

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.7
1+
sbt.version=1.11.4
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package sbtlicensereport
2+
3+
private[sbtlicensereport] object SbtLicenseReportCompat {
4+
def IvyDependencyResolution = sbt.librarymanagement.ivy.IvyDependencyResolution
5+
6+
implicit class DefOps(private val self: sbt.Def.type) extends AnyVal {
7+
def uncached[A](a: A): A = a
8+
}
9+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package sbtlicensereport
2+
3+
private[sbtlicensereport] object SbtLicenseReportCompat {
4+
def IvyDependencyResolution = sbt.internal.librarymanagement.ivy.IvyDependencyResolution
5+
}

src/main/scala/sbtlicensereport/SbtLicenseReport.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sbtlicensereport
22

33
import sbt._
4-
import sbt.librarymanagement.ivy.IvyDependencyResolution
4+
import sbtlicensereport.SbtLicenseReportCompat._
55
import Keys._
66
import license._
77

@@ -81,7 +81,7 @@ object SbtLicenseReport extends AutoPlugin {
8181
override lazy val projectSettings: Seq[Setting[_]] =
8282
Seq(
8383
licenseReportTitle := s"${normalizedName.value}-licenses",
84-
updateLicenses := {
84+
updateLicenses := Def.uncached {
8585
val ignore = update.value
8686
val overrides = licenseOverrides.value.lift
8787
val depExclusions = licenseDepExclusions.value.lift
@@ -101,7 +101,7 @@ object SbtLicenseReport extends AutoPlugin {
101101
licenseReportMakeHeader := (language => language.header1(licenseReportTitle.value)),
102102
// TODO - Maybe we need a general purpose reporting directory
103103
licenseReportDir := target.value / "license-reports",
104-
licenseReportConfigurations := {
104+
licenseReportConfigurations := Def.uncached {
105105
val dir = licenseReportDir.value
106106
val styleRules = licenseReportStyleRules.value
107107
// TODO - Configurable language (markdown/html/csv) rather than all always
@@ -119,28 +119,28 @@ object SbtLicenseReport extends AutoPlugin {
119119
)
120120
Seq(config)
121121
},
122-
dumpLicenseReport := {
122+
dumpLicenseReport := Def.uncached {
123123
val report = updateLicenses.value
124124
val dir = licenseReportDir.value
125125
for (config <- licenseReportConfigurations.value)
126126
LicenseReport.dumpLicenseReport(report.licenses, config)
127127
dir
128128
},
129-
dumpLicenseReportAggregate := {
129+
dumpLicenseReportAggregate := Def.uncached {
130130
val reports = aggregateUpdateLicenses.value
131131
val dir = licenseReportDir.value
132132
for (config <- licenseReportConfigurations.value)
133133
LicenseReport.dumpLicenseReport(reports.flatMap(_.licenses), config)
134134
dir
135135
},
136-
dumpLicenseReportAnyProject := {
136+
dumpLicenseReportAnyProject := Def.uncached {
137137
val reports = anyProjectUpdateLicenses.value
138138
val dir = licenseReportDir.value
139139
for (config <- licenseReportConfigurations.value)
140140
LicenseReport.dumpLicenseReport(reports.flatMap(_.licenses), config)
141141
dir
142142
},
143-
licenseCheck := {
143+
licenseCheck := Def.uncached {
144144
val log = streams.value.log
145145
val report = updateLicenses.value
146146
val allowed = licenseCheckAllow.value

0 commit comments

Comments
 (0)