Skip to content

fix(detekt-rules): Correctly determine the root project #11954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sschuberth wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(detekt-rules): Correctly determine the root project #11954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c349dc4
fix(detekt-rules): Correctly determine the root project
sschuberth Jun 5, 2026
abda93f
chore: Fix package names that slipped through while the check was broken
sschuberth Jun 5, 2026
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
2 changes: 1 addition & 1 deletion detekt-rules/src/main/kotlin/OrtPackageNaming.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class OrtPackageNaming(config: Config) : Rule(

// TODO: Find a better way to determine the project path. Unfortunately, `KtFile.project.basePath` is null.
projectPath = generateSequence(root.absolutePath()) { it.parent }.find {
it.resolve("build.gradle.kts").isRegularFile()
it.resolve("settings.gradle.kts").isRegularFile()
}
}

Expand Down
2 changes: 1 addition & 1 deletion detekt-rules/src/test/kotlin/OrtPackageNamingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class OrtPackageNamingTest : WordSpec({
})

private fun TestConfiguration.createFile(dir: String, content: String): KtFile {
val projectDir = tempdir().apply { resolve("build.gradle.kts").createNewFile() }
val projectDir = tempdir().apply { resolve("settings.gradle.kts").createNewFile() }
val parent = projectDir.resolve(dir).safeMkdirs()
val file = parent.resolve("Test.kt").apply { writeText(content) }
return compileForTest(file.toPath())
Expand Down
2 changes: 1 addition & 1 deletion plugins/package-managers/ort-project-file/src/funTest/kotlin/OrtProjectFileFunTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.ortproject
package org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile

import io.kotest.core.spec.style.WordSpec
import io.kotest.matchers.collections.beEmpty as beEmptyCollection
Expand Down
2 changes: 1 addition & 1 deletion plugins/package-managers/ort-project-file/src/main/kotlin/OrtProject.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.ortproject
package org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile

import com.charleskorn.kaml.Yaml

Expand Down
2 changes: 1 addition & 1 deletion plugins/package-managers/ort-project-file/src/main/kotlin/OrtProjectFile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.ortproject
package org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile

import java.io.File

Expand Down
8 changes: 4 additions & 4 deletions plugins/package-managers/ort-project-file/src/main/kotlin/OrtProjectMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.ortproject
package org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile

import java.io.File

Expand All @@ -39,9 +39,9 @@ import org.ossreviewtoolkit.model.orNone
import org.ossreviewtoolkit.model.utils.toIdentifier
import org.ossreviewtoolkit.model.utils.toPackageUrl
import org.ossreviewtoolkit.model.utils.toPurl
import org.ossreviewtoolkit.plugins.packagemanagers.ortproject.OrtProject.Dependency
import org.ossreviewtoolkit.plugins.packagemanagers.ortproject.OrtProject.SourceArtifact
import org.ossreviewtoolkit.plugins.packagemanagers.ortproject.OrtProject.Vcs
import org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile.OrtProject.Dependency
import org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile.OrtProject.SourceArtifact
import org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile.OrtProject.Vcs

private const val DEFAULT_SCOPE_NAME = "unnamed"
private const val PROJECT_TYPE = "OrtProjectFile"
Expand Down
2 changes: 1 addition & 1 deletion plugins/package-managers/spdx-document-file/src/funTest/kotlin/SpdxDocumentFileFunTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.spdx
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile

import io.kotest.core.annotation.Tags
import io.kotest.core.spec.style.WordSpec
Expand Down
24 changes: 12 additions & 12 deletions plugins/package-managers/spdx-document-file/src/main/kotlin/SpdxDocumentFile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.spdx
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile

import java.io.File

Expand Down Expand Up @@ -49,17 +49,17 @@ import org.ossreviewtoolkit.plugins.api.OrtPlugin
import org.ossreviewtoolkit.plugins.api.OrtPluginOption
import org.ossreviewtoolkit.plugins.api.PluginConfig
import org.ossreviewtoolkit.plugins.api.PluginDescriptor
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.SpdxDocumentCache
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.SpdxResolvedDocument
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.extractScopeFromExternalReferences
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.isExternalDocumentReferenceId
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.locateCpe
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.locateExternalReference
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.mapNotPresentToEmpty
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.projectPackage
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.toIdentifier
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.toPackage
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.wrapPresentInSet
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.SpdxDocumentCache
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.SpdxResolvedDocument
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.extractScopeFromExternalReferences
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.isExternalDocumentReferenceId
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.locateCpe
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.locateExternalReference
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.mapNotPresentToEmpty
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.projectPackage
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.toIdentifier
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.toPackage
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.wrapPresentInSet
import org.ossreviewtoolkit.utils.spdxdocument.model.SpdxExternalReference
import org.ossreviewtoolkit.utils.spdxdocument.model.SpdxPackage
import org.ossreviewtoolkit.utils.spdxdocument.model.SpdxRelationship
Expand Down
4 changes: 2 additions & 2 deletions plugins/package-managers/spdx-document-file/src/main/kotlin/utils/SpdxDocumentCache.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils

import java.io.File

import org.apache.logging.log4j.kotlin.logger

import org.ossreviewtoolkit.plugins.packagemanagers.spdx.SpdxDocumentFile
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.SpdxDocumentFile
import org.ossreviewtoolkit.utils.spdxdocument.SpdxModelMapper
import org.ossreviewtoolkit.utils.spdxdocument.model.SpdxDocument

Expand Down
4 changes: 2 additions & 2 deletions plugins/package-managers/spdx-document-file/src/main/kotlin/utils/SpdxExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils

import java.io.File

Expand All @@ -36,7 +36,7 @@ import org.ossreviewtoolkit.model.orEmpty
import org.ossreviewtoolkit.model.utils.toIdentifier
import org.ossreviewtoolkit.model.utils.toPackageUrl
import org.ossreviewtoolkit.model.utils.toPurl
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.PACKAGE_TYPE_SPDX
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.PACKAGE_TYPE_SPDX
import org.ossreviewtoolkit.utils.common.withoutPrefix
import org.ossreviewtoolkit.utils.spdx.SpdxConstants
import org.ossreviewtoolkit.utils.spdxdocument.model.SpdxDocument
Expand Down
6 changes: 3 additions & 3 deletions plugins/package-managers/spdx-document-file/src/main/kotlin/utils/SpdxResolvedDocument.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

@file:Suppress("TooManyFunctions")

package org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils

import java.io.File
import java.net.URI
Expand All @@ -30,8 +30,8 @@ import org.ossreviewtoolkit.model.Hash
import org.ossreviewtoolkit.model.Issue
import org.ossreviewtoolkit.model.Severity
import org.ossreviewtoolkit.model.createAndLogIssue
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.SpdxDocumentFile
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.SpdxDocumentFileFactory
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.SpdxDocumentFile
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.SpdxDocumentFileFactory
import org.ossreviewtoolkit.utils.authentication.requestPasswordAuthentication
import org.ossreviewtoolkit.utils.common.collectMessages
import org.ossreviewtoolkit.utils.common.safeDeleteRecursively
Expand Down
2 changes: 1 addition & 1 deletion plugins/package-managers/spdx-document-file/src/main/kotlin/utils/StringExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils

import org.ossreviewtoolkit.model.Identifier
import org.ossreviewtoolkit.utils.common.collapseWhitespace
Expand Down
10 changes: 5 additions & 5 deletions plugins/package-managers/spdx-document-file/src/test/kotlin/SpdxDocumentFileTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.spdx
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile

import io.kotest.core.spec.style.WordSpec
import io.kotest.matchers.nulls.beNull
Expand All @@ -32,10 +32,10 @@ import java.io.File
import org.ossreviewtoolkit.model.VcsInfo
import org.ossreviewtoolkit.model.VcsType
import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.SpdxResolvedDocument
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.extractScopeFromExternalReferences
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.getVcsInfo
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.projectPackage
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.SpdxResolvedDocument
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.extractScopeFromExternalReferences
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.getVcsInfo
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.projectPackage
import org.ossreviewtoolkit.utils.common.div
import org.ossreviewtoolkit.utils.spdx.SpdxConstants
import org.ossreviewtoolkit.utils.spdxdocument.SpdxModelMapper
Expand Down
2 changes: 1 addition & 1 deletion plugins/package-managers/spdx-document-file/src/test/kotlin/utils/SpdxDocumentCacheTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils

import io.kotest.core.spec.style.WordSpec
import io.kotest.matchers.should
Expand Down
4 changes: 2 additions & 2 deletions ...ins/package-managers/spdx-document-file/src/test/kotlin/utils/SpdxResolvedDocumentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils

import com.github.tomakehurst.wiremock.WireMockServer
import com.github.tomakehurst.wiremock.client.WireMock
Expand Down Expand Up @@ -48,7 +48,7 @@ import java.net.URI

import org.ossreviewtoolkit.model.Issue
import org.ossreviewtoolkit.model.Severity
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.SpdxDocumentFileFactory
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.SpdxDocumentFileFactory
import org.ossreviewtoolkit.utils.common.calculateHash
import org.ossreviewtoolkit.utils.common.div
import org.ossreviewtoolkit.utils.spdxdocument.SpdxModelMapper
Expand Down
Loading