deps: update ort to v32

oss-review-toolkit · Sep 13, 2024 · 3824012 · 3824012
1 parent 218f768
commit 3824012
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ log4jApi = "2.24.0"
 log4jApiKotlin = "1.5.0"
 logbackImpl = "1.5.8"
 moleculeRuntime = "2.0.0"
-ort = "30.0.0"
+ort = "32.1.0"
 richtext = "0.20.0"
 
 [plugins]

diff --git a/src/main/kotlin/model/OrtApi.kt b/src/main/kotlin/model/OrtApi.kt
@@ -27,9 +27,9 @@ import org.ossreviewtoolkit.model.licenses.LicenseInfoResolver
 import org.ossreviewtoolkit.model.licenses.ResolvedLicenseInfo
 import org.ossreviewtoolkit.model.utils.DefaultResolutionProvider
 import org.ossreviewtoolkit.model.utils.FileArchiver
-import org.ossreviewtoolkit.model.utils.PackageConfigurationProvider
 import org.ossreviewtoolkit.model.utils.ResolutionProvider
 import org.ossreviewtoolkit.model.utils.createLicenseInfoResolver
+import org.ossreviewtoolkit.plugins.packageconfigurationproviders.api.PackageConfigurationProvider
 import org.ossreviewtoolkit.reporter.IssueStatistics
 import org.ossreviewtoolkit.workbench.utils.getOrZero
 
@@ -40,7 +40,7 @@ class OrtApi(
     private val fileArchiver: FileArchiver?,
     private val licenseInfoProvider: LicenseInfoProvider,
     private val licenseInfoResolver: LicenseInfoResolver,
-    private val packageConfigurationProvider: PackageConfigurationProvider,
+    private val packageConfigurationProvider: PackageConfigurationProvider?,
     private val resolutionProvider: ResolutionProvider
 ) {
     companion object {
@@ -49,7 +49,7 @@ class OrtApi(
             val copyrightGarbage = CopyrightGarbage()
             val config = OrtConfiguration()
             val fileArchiver = config.scanner.archive.createFileArchiver()
-            val packageConfigurationProvider = PackageConfigurationProvider.EMPTY
+            val packageConfigurationProvider = null
             val licenseInfoProvider = DefaultLicenseInfoProvider(result)
 
             OrtApi(

diff --git a/src/main/kotlin/model/OrtModel.kt b/src/main/kotlin/model/OrtModel.kt
@@ -24,9 +24,9 @@ import org.ossreviewtoolkit.model.config.OrtConfiguration
 import org.ossreviewtoolkit.model.config.createFileArchiver
 import org.ossreviewtoolkit.model.licenses.DefaultLicenseInfoProvider
 import org.ossreviewtoolkit.model.readValue
-import org.ossreviewtoolkit.model.utils.CompositePackageConfigurationProvider
 import org.ossreviewtoolkit.model.utils.DefaultResolutionProvider
 import org.ossreviewtoolkit.model.utils.createLicenseInfoResolver
+import org.ossreviewtoolkit.plugins.packageconfigurationproviders.api.CompositePackageConfigurationProvider
 import org.ossreviewtoolkit.plugins.packageconfigurationproviders.api.SimplePackageConfigurationProvider
 import org.ossreviewtoolkit.plugins.packageconfigurationproviders.dir.DirPackageConfigurationProvider
 import org.ossreviewtoolkit.utils.ort.ORT_CONFIG_FILENAME
@@ -179,8 +179,9 @@ class OrtModel(val settings: StateFlow<WorkbenchSettings>) {
                 FileArchiverConfiguration().createFileArchiver()
             }
 
-            val resolvedPackageConfigurationProvider =
-                SimplePackageConfigurationProvider(result.resolvedConfiguration.packageConfigurations.orEmpty())
+            val resolvedPackageConfigurationProvider = SimplePackageConfigurationProvider(
+                configurations = result.resolvedConfiguration.packageConfigurations.orEmpty()
+            )
             val packageConfigurationsDir = configDir.resolve(ORT_PACKAGE_CONFIGURATIONS_DIRNAME)
 
             val packageConfigurationProvider =