Skip to content

Commit 7818820

Browse files
committed
build(Cargo): Move the Cargo package manager to its own plugin project
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
1 parent b4e8089 commit 7818820

26 files changed

+47
-4
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
org.ossreviewtoolkit.analyzer.managers.Cargo$Factory
21
org.ossreviewtoolkit.analyzer.managers.Carthage$Factory
32
org.ossreviewtoolkit.analyzer.managers.CocoaPods$Factory
43
org.ossreviewtoolkit.analyzer.managers.Composer$Factory

plugins/package-managers/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ javaPlatform {
3030
dependencies {
3131
api(project(":plugins:package-managers:bower-package-manager"))
3232
api(project(":plugins:package-managers:bundler-package-manager"))
33+
api(project(":plugins:package-managers:cargo-package-manager"))
3334
api(project(":plugins:package-managers:gradle-model"))
3435
api(project(":plugins:package-managers:gradle-package-manager"))
3536
api(project(":plugins:package-managers:pub-package-manager"))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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+
implementation(libs.toml4j)
31+
constraints {
32+
implementation("com.google.code.gson:gson:2.10.1") {
33+
because("Earlier versions have vulnerabilities.")
34+
}
35+
}
36+
37+
funTestImplementation(testFixtures(project(":analyzer")))
38+
}

analyzer/src/funTest/kotlin/managers/CargoFunTest.kt plugins/package-managers/cargo/src/funTest/kotlin/CargoFunTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
* License-Filename: LICENSE
1818
*/
1919

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

2222
import io.kotest.core.spec.style.StringSpec
2323
import io.kotest.matchers.shouldBe
2424

25+
import org.ossreviewtoolkit.analyzer.managers.resolveSingleProject
2526
import org.ossreviewtoolkit.downloader.VersionControlSystem
2627
import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
2728
import org.ossreviewtoolkit.model.config.RepositoryConfiguration

analyzer/src/funTest/kotlin/managers/CargoSubcrateFunTest.kt plugins/package-managers/cargo/src/funTest/kotlin/CargoSubcrateFunTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
* License-Filename: LICENSE
1818
*/
1919

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

2222
import io.kotest.core.spec.style.StringSpec
2323
import io.kotest.matchers.shouldBe
2424

25+
import org.ossreviewtoolkit.analyzer.managers.resolveSingleProject
2526
import org.ossreviewtoolkit.downloader.VersionControlSystem
2627
import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
2728
import org.ossreviewtoolkit.model.config.RepositoryConfiguration

analyzer/src/main/kotlin/managers/Cargo.kt plugins/package-managers/cargo/src/main/kotlin/Cargo.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
@file:Suppress("TooManyFunctions")
2121

22-
package org.ossreviewtoolkit.analyzer.managers
22+
package org.ossreviewtoolkit.plugins.packagemanagers.cargo
2323

2424
import com.fasterxml.jackson.databind.JsonNode
2525

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.ossreviewtoolkit.plugins.packagemanagers.cargo.Cargo$Factory

settings.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ include(":plugins:package-curation-providers:sw360")
4747
include(":plugins:package-managers")
4848
include(":plugins:package-managers:bower")
4949
include(":plugins:package-managers:bundler")
50+
include(":plugins:package-managers:cargo")
5051
include(":plugins:package-managers:gradle")
5152
include(":plugins:package-managers:gradle-model")
5253
include(":plugins:package-managers:pub")
@@ -77,6 +78,7 @@ project(":plugins:package-curation-providers:sw360").name = "sw360-package-curat
7778

7879
project(":plugins:package-managers:bower").name = "bower-package-manager"
7980
project(":plugins:package-managers:bundler").name = "bundler-package-manager"
81+
project(":plugins:package-managers:cargo").name = "cargo-package-manager"
8082
project(":plugins:package-managers:gradle").name = "gradle-package-manager"
8183
project(":plugins:package-managers:pub").name = "pub-package-manager"
8284
project(":plugins:package-managers:python").name = "python-package-manager"

0 commit comments

Comments
 (0)