Skip to content

Commit dc5f829

Browse files
committed
refactor: Align with licenseSource having changed to a Set
Signed-off-by: Frank Viernau <frank.viernau@gmail.com>
1 parent 24742b2 commit dc5f829

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

evaluator.rules.kts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,7 @@ fun RuleSet.commercialInDependencyRule() = packageRule("COMMERCIAL_IN_DEPENDENCY
11621162
error(
11631163
"The dependency '${pkg.metadata.id.toCoordinates()}' is licensed under the ScanCode 'commercial' " +
11641164
"categorized license $license. This requires approval.",
1165-
howToFixLicenseViolationDefault(license.toString(), licenseSource)
1165+
howToFixLicenseViolationDefault(license.toString(), licenseSources.single())
11661166
)
11671167
}
11681168
}
@@ -1182,7 +1182,7 @@ fun RuleSet.copyleftInDependencyRule() = packageRule("COPYLEFT_IN_DEPENDENCY") {
11821182
error(
11831183
"The dependency '${pkg.metadata.id.toCoordinates()}' is licensed under the ScanCode 'copyleft' " +
11841184
"categorized license $license.",
1185-
howToFixLicenseViolationDefault(license.toString(), licenseSource)
1185+
howToFixLicenseViolationDefault(license.toString(), licenseSources.single())
11861186
)
11871187
}
11881188
}
@@ -1202,7 +1202,7 @@ fun RuleSet.copyleftLimitedInDependencyRule() = dependencyRule("COPYLEFT_LIMITED
12021202
error(
12031203
"The dependency '${pkg.metadata.id.toCoordinates()}' is statically linked and licensed under the " +
12041204
"ScanCode 'copyleft-limited' categorized license $license.",
1205-
howToFixLicenseViolationDefault(license.toString(), licenseSource)
1205+
howToFixLicenseViolationDefault(license.toString(), licenseSources.single())
12061206
)
12071207
}
12081208
}
@@ -1220,9 +1220,9 @@ fun RuleSet.copyleftInSourceRule() = packageRule("COPYLEFT_IN_SOURCE") {
12201220
}
12211221

12221222
error(
1223-
"The ScanCode 'copyleft' categorized license $license was ${licenseSource.name.lowercase()} in project " +
1223+
"The ScanCode 'copyleft' categorized license $license was ${licenseSources.single().name.lowercase()} in project " +
12241224
"'${pkg.metadata.id.toCoordinates()}'.",
1225-
howToFixLicenseViolationDefault(license.toString(), licenseSource)
1225+
howToFixLicenseViolationDefault(license.toString(), licenseSources.single())
12261226
)
12271227
}
12281228
}
@@ -1240,9 +1240,9 @@ fun RuleSet.copyleftLimitedInSourceRule() = packageRule("COPYLEFT_LIMITED_IN_SOU
12401240
}
12411241

12421242
error(
1243-
"The ScanCode 'copyleft-limited' categorized license $license was ${licenseSource.name.lowercase()} in " +
1243+
"The ScanCode 'copyleft-limited' categorized license $license was ${licenseSources.single().name.lowercase()} in " +
12441244
"project '${pkg.metadata.id.toCoordinates()}'.",
1245-
howToFixLicenseViolationDefault(license.toString(), licenseSource)
1245+
howToFixLicenseViolationDefault(license.toString(), licenseSources.single())
12461246
)
12471247
}
12481248
}
@@ -1297,7 +1297,7 @@ fun RuleSet.freeRestrictedInDependencyRule() = packageRule("FREE_RESTRICTED_IN_D
12971297
error(
12981298
"The dependency '${pkg.metadata.id.toCoordinates()}' is licensed under the ScanCode 'free-restricted' " +
12991299
"categorized license $license. This requires approval.",
1300-
howToFixLicenseViolationDefault(license.toString(), licenseSource)
1300+
howToFixLicenseViolationDefault(license.toString(), licenseSources.single())
13011301
)
13021302
}
13031303
}
@@ -1319,7 +1319,7 @@ fun RuleSet.genericInDependencyRule() = packageRule("GENERIC_IN_DEPENDENCY") {
13191319
"The dependency '${pkg.metadata.id.toCoordinates()}' might contain a license which is unknown to the " +
13201320
" tooling. It was detected as $license which is just a trigger, but not a real license. Please " +
13211321
"create a dedicated license identifier if the finding is valid.",
1322-
howToFixLicenseViolationDefault(license.toString(), licenseSource)
1322+
howToFixLicenseViolationDefault(license.toString(), licenseSources.single())
13231323
)
13241324
}
13251325
}
@@ -1459,7 +1459,7 @@ fun RuleSet.patentInDependencyRule() = packageRule("PATENT_IN_DEPENDENCY") {
14591459
error(
14601460
"The dependency '${pkg.metadata.id.toCoordinates()}' is licensed under the ScanCode 'patent-license' " +
14611461
"categorized license $license. This requires approval.",
1462-
howToFixLicenseViolationDefault(license.toString(), licenseSource)
1462+
howToFixLicenseViolationDefault(license.toString(), licenseSources.single())
14631463
)
14641464
}
14651465
}
@@ -1479,7 +1479,7 @@ fun RuleSet.proprietaryFreeInDependencyRule() = packageRule("PROPRIETARY_FREE_IN
14791479
error(
14801480
"The dependency '${pkg.metadata.id.toCoordinates()}' is licensed under the ScanCode 'proprietary-free' " +
14811481
"categorized license $license. This requires approval.",
1482-
howToFixLicenseViolationDefault(license.toString(), licenseSource)
1482+
howToFixLicenseViolationDefault(license.toString(), licenseSources.single())
14831483
)
14841484
}
14851485
}
@@ -1501,7 +1501,7 @@ fun RuleSet.unkownInDependencyRule() = packageRule("UNKNOWN_IN_DEPENDENCY") {
15011501
"The dependency '${pkg.metadata.id.toCoordinates()}' might contain a license which is unknown to the " +
15021502
" tooling. It was detected as $license which is just a trigger, but not a real license. Please " +
15031503
"create a dedicated license identifier if the finding is valid.",
1504-
howToFixLicenseViolationDefault(license.toString(), licenseSource)
1504+
howToFixLicenseViolationDefault(license.toString(), licenseSources.single())
15051505
)
15061506
}
15071507
}
@@ -1521,7 +1521,7 @@ fun RuleSet.unstatedInDependencyRule() = packageRule("UNSTATED_IN_DEPENDENCY") {
15211521
error(
15221522
"The dependency '${pkg.metadata.id.toCoordinates()}' is licensed under the ScanCode 'unstated-licenses' " +
15231523
"categorized license $license. This requires approval.",
1524-
howToFixLicenseViolationDefault(license.toString(), licenseSource)
1524+
howToFixLicenseViolationDefault(license.toString(), licenseSources.single())
15251525
)
15261526
}
15271527
}
@@ -1591,9 +1591,9 @@ fun RuleSet.unhandledLicenseRule() = packageRule("UNHANDLED_LICENSE") {
15911591

15921592
error(
15931593
"The license $license is currently not covered by policy rules. " +
1594-
"The license was ${licenseSource.name.lowercase()} in package " +
1594+
"The license was ${licenseSources.single().name.lowercase()} in package " +
15951595
"'${pkg.metadata.id.toCoordinates()}'.",
1596-
howToFixUnhandledLicense(license.toString(), licenseSource)
1596+
howToFixUnhandledLicense(license.toString(), licenseSources.single())
15971597
)
15981598
}
15991599
}

0 commit comments

Comments
 (0)