Skip to content

Commit 00e4f3c

Browse files
committed
build(Pub): Move the Pub package manager to its own plugin project
This continues the effort started in be4bb69 to move plugin implementations, here for the Pub package manager. See [1] for more context. [1]: #6602 Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent 4783efa commit 00e4f3c

33 files changed

+42
-7
lines changed

analyzer/src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ org.ossreviewtoolkit.analyzer.managers.Maven$Factory
1212
org.ossreviewtoolkit.analyzer.managers.Npm$Factory
1313
org.ossreviewtoolkit.analyzer.managers.NuGet$Factory
1414
org.ossreviewtoolkit.analyzer.managers.Pnpm$Factory
15-
org.ossreviewtoolkit.analyzer.managers.Pub$Factory
1615
org.ossreviewtoolkit.analyzer.managers.Sbt$Factory
1716
org.ossreviewtoolkit.analyzer.managers.SpdxDocumentFile$Factory
1817
org.ossreviewtoolkit.analyzer.managers.Stack$Factory

plugins/package-managers/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ javaPlatform {
2929

3030
dependencies {
3131
api(project(":plugins:package-managers:gradle-package-manager"))
32+
api(project(":plugins:package-managers:pub-package-manager"))
3233
api(project(":plugins:package-managers:python-package-manager"))
3334
}
3435

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* Copyright (C) 2023 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*
16+
* SPDX-License-Identifier: Apache-2.0
17+
* License-Filename: LICENSE
18+
*/
19+
20+
plugins {
21+
// Apply core plugins.
22+
`java-library`
23+
}
24+
25+
dependencies {
26+
api(project(":analyzer"))
27+
28+
implementation(project(":downloader"))
29+
30+
funTestImplementation(testFixtures(project(":analyzer")))
31+
}

analyzer/src/funTest/kotlin/managers/PubFunTest.kt renamed to plugins/package-managers/pub/src/funTest/kotlin/PubFunTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.analyzer.managers
20+
package org.ossreviewtoolkit.plugins.packagemanagers.pub
2121

2222
import io.kotest.core.spec.style.WordSpec
2323
import io.kotest.matchers.collections.beEmpty
@@ -28,6 +28,7 @@ import io.kotest.matchers.string.haveSubstring
2828
import java.io.File
2929

3030
import org.ossreviewtoolkit.analyzer.Analyzer
31+
import org.ossreviewtoolkit.analyzer.managers.resolveSingleProject
3132
import org.ossreviewtoolkit.downloader.VersionControlSystem
3233
import org.ossreviewtoolkit.model.AnalyzerResult
3334
import org.ossreviewtoolkit.model.Hash

analyzer/src/main/kotlin/managers/Pub.kt renamed to plugins/package-managers/pub/src/main/kotlin/Pub.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.analyzer.managers
20+
package org.ossreviewtoolkit.plugins.packagemanagers.pub
2121

2222
import com.fasterxml.jackson.databind.JsonNode
2323
import com.fasterxml.jackson.dataformat.yaml.JacksonYAMLParseException
@@ -33,7 +33,6 @@ import org.ossreviewtoolkit.analyzer.PackageManager
3333
import org.ossreviewtoolkit.analyzer.PackageManagerDependencyResult
3434
import org.ossreviewtoolkit.analyzer.PackageManagerResult
3535
import org.ossreviewtoolkit.analyzer.managers.utils.PackageManagerDependencyHandler
36-
import org.ossreviewtoolkit.analyzer.managers.utils.PubCacheReader
3736
import org.ossreviewtoolkit.analyzer.parseAuthorString
3837
import org.ossreviewtoolkit.downloader.VcsHost
3938
import org.ossreviewtoolkit.downloader.VersionControlSystem
@@ -55,6 +54,7 @@ import org.ossreviewtoolkit.model.config.PackageManagerConfiguration
5554
import org.ossreviewtoolkit.model.config.RepositoryConfiguration
5655
import org.ossreviewtoolkit.model.createAndLogIssue
5756
import org.ossreviewtoolkit.model.yamlMapper
57+
import org.ossreviewtoolkit.plugins.packagemanagers.pub.utils.PubCacheReader
5858
import org.ossreviewtoolkit.utils.common.CommandLineTool
5959
import org.ossreviewtoolkit.utils.common.Os
6060
import org.ossreviewtoolkit.utils.common.ProcessCapture

analyzer/src/main/kotlin/managers/utils/PubCacheReader.kt renamed to plugins/package-managers/pub/src/main/kotlin/utils/PubCacheReader.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.analyzer.managers.utils
20+
package org.ossreviewtoolkit.plugins.packagemanagers.pub.utils
2121

2222
import com.fasterxml.jackson.databind.JsonNode
2323

2424
import java.io.File
2525

2626
import org.apache.logging.log4j.kotlin.Logging
2727

28-
import org.ossreviewtoolkit.analyzer.managers.flutterHome
2928
import org.ossreviewtoolkit.downloader.VcsHost
29+
import org.ossreviewtoolkit.plugins.packagemanagers.pub.flutterHome
3030
import org.ossreviewtoolkit.utils.common.Os
3131
import org.ossreviewtoolkit.utils.common.isSymbolicLink
3232
import org.ossreviewtoolkit.utils.common.textValueOrEmpty
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.ossreviewtoolkit.plugins.packagemanagers.pub.Pub$Factory

analyzer/src/test/kotlin/managers/utils/PubCacheReaderTest.kt renamed to plugins/package-managers/pub/src/test/kotlin/utils/PubCacheReaderTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.analyzer.managers.utils
20+
package org.ossreviewtoolkit.plugins.packagemanagers.pub.utils
2121

2222
import io.kotest.core.spec.style.WordSpec
2323
import io.kotest.matchers.shouldBe

settings.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ include(":plugins:package-curation-providers:ort-config")
4646
include(":plugins:package-curation-providers:sw360")
4747
include(":plugins:package-managers")
4848
include(":plugins:package-managers:gradle")
49+
include(":plugins:package-managers:pub")
4950
include(":plugins:package-managers:python")
5051
include(":reporter")
5152
include(":reporter-web-app")
@@ -72,6 +73,7 @@ project(":plugins:package-curation-providers:ort-config").name = "ort-config-pac
7273
project(":plugins:package-curation-providers:sw360").name = "sw360-package-curation-provider"
7374

7475
project(":plugins:package-managers:gradle").name = "gradle-package-manager"
76+
project(":plugins:package-managers:pub").name = "pub-package-manager"
7577
project(":plugins:package-managers:python").name = "python-package-manager"
7678

7779
project(":utils:common").name = "common-utils"

0 commit comments

Comments
 (0)