Changed line format for build output. Sorted license info.

This commit is contained in:
Robinson 2023-01-13 01:24:23 +01:00
parent 685bfab66c
commit 42c20d2bdf
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
1 changed files with 10 additions and 5 deletions

View File

@ -4,12 +4,13 @@ import License
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.artifacts.ResolvedArtifact import org.gradle.api.artifacts.ResolvedArtifact
import org.gradle.api.artifacts.ResolvedDependency import org.gradle.api.artifacts.ResolvedDependency
import java.io.* import java.io.File
import java.io.FileInputStream
import java.io.ObjectInputStream
import java.time.Instant import java.time.Instant
import java.time.ZoneId import java.time.ZoneId
import java.util.* import java.util.*
import java.util.zip.ZipFile import java.util.zip.*
import java.util.zip.ZipInputStream
object LicenseDependencyScanner { object LicenseDependencyScanner {
// scans and loads license data into the extension // scans and loads license data into the extension
@ -72,7 +73,7 @@ object LicenseDependencyScanner {
if (!primaryLicense.extras.contains(data)) { if (!primaryLicense.extras.contains(data)) {
alreadyScanDeps.add(dep) alreadyScanDeps.add(dep)
preloadedText.add("\t\t${dep.mavenId()} [${data.license}]") preloadedText.add("\t\t[${data.license}] ${dep.mavenId()}")
// NOTE: the END copyright for these are determined by the DATE of the files! // NOTE: the END copyright for these are determined by the DATE of the files!
// Some dates are WRONG (because the jar build is mucked with), so we manually fix it // Some dates are WRONG (because the jar build is mucked with), so we manually fix it
@ -157,7 +158,7 @@ object LicenseDependencyScanner {
if (licenseData != null) { if (licenseData != null) {
alreadyScanDeps.add(dep) alreadyScanDeps.add(dep)
embeddedText.add("\t\t$dep [$licenseData]") embeddedText.add("\t\t[$licenseData] $dep")
} else { } else {
actuallyMissingLicenseInfo.add(projAndDep) actuallyMissingLicenseInfo.add(projAndDep)
} }
@ -191,6 +192,10 @@ object LicenseDependencyScanner {
} }
} }
preloadedText.sort()
embeddedText.sort()
missingText.sort()
return ScanDep(project, preloadedText, embeddedText, missingText) return ScanDep(project, preloadedText, embeddedText, missingText)
} }