Skip to content

Commit

Permalink
build(Cargo): Move the Cargo package manager to its own plugin project
Browse files Browse the repository at this point in the history
Signed-off-by: Sebastian Schuberth <[email protected]>
  • Loading branch information
sschuberth committed Mar 20, 2023
1 parent b4e8089 commit 7818820
Show file tree
Hide file tree
Showing 26 changed files with 47 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
org.ossreviewtoolkit.analyzer.managers.Cargo$Factory
org.ossreviewtoolkit.analyzer.managers.Carthage$Factory
org.ossreviewtoolkit.analyzer.managers.CocoaPods$Factory
org.ossreviewtoolkit.analyzer.managers.Composer$Factory
Expand Down
1 change: 1 addition & 0 deletions plugins/package-managers/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ javaPlatform {
dependencies {
api(project(":plugins:package-managers:bower-package-manager"))
api(project(":plugins:package-managers:bundler-package-manager"))
api(project(":plugins:package-managers:cargo-package-manager"))
api(project(":plugins:package-managers:gradle-model"))
api(project(":plugins:package-managers:gradle-package-manager"))
api(project(":plugins:package-managers:pub-package-manager"))
Expand Down
38 changes: 38 additions & 0 deletions plugins/package-managers/cargo/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* Copyright (C) 2023 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* SPDX-License-Identifier: Apache-2.0
* License-Filename: LICENSE
*/

plugins {
// Apply core plugins.
`java-library`
}

dependencies {
api(project(":analyzer"))

implementation(project(":downloader"))

implementation(libs.toml4j)
constraints {
implementation("com.google.code.gson:gson:2.10.1") {
because("Earlier versions have vulnerabilities.")
}
}

funTestImplementation(testFixtures(project(":analyzer")))
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.analyzer.managers
package org.ossreviewtoolkit.plugins.packagemanagers.cargo

import io.kotest.core.spec.style.StringSpec
import io.kotest.matchers.shouldBe

import org.ossreviewtoolkit.analyzer.managers.resolveSingleProject
import org.ossreviewtoolkit.downloader.VersionControlSystem
import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
import org.ossreviewtoolkit.model.config.RepositoryConfiguration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
* License-Filename: LICENSE
*/

package org.ossreviewtoolkit.analyzer.managers
package org.ossreviewtoolkit.plugins.packagemanagers.cargo

import io.kotest.core.spec.style.StringSpec
import io.kotest.matchers.shouldBe

import org.ossreviewtoolkit.analyzer.managers.resolveSingleProject
import org.ossreviewtoolkit.downloader.VersionControlSystem
import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
import org.ossreviewtoolkit.model.config.RepositoryConfiguration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

@file:Suppress("TooManyFunctions")

package org.ossreviewtoolkit.analyzer.managers
package org.ossreviewtoolkit.plugins.packagemanagers.cargo

import com.fasterxml.jackson.databind.JsonNode

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.ossreviewtoolkit.plugins.packagemanagers.cargo.Cargo$Factory
2 changes: 2 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ include(":plugins:package-curation-providers:sw360")
include(":plugins:package-managers")
include(":plugins:package-managers:bower")
include(":plugins:package-managers:bundler")
include(":plugins:package-managers:cargo")
include(":plugins:package-managers:gradle")
include(":plugins:package-managers:gradle-model")
include(":plugins:package-managers:pub")
Expand Down Expand Up @@ -77,6 +78,7 @@ project(":plugins:package-curation-providers:sw360").name = "sw360-package-curat

project(":plugins:package-managers:bower").name = "bower-package-manager"
project(":plugins:package-managers:bundler").name = "bundler-package-manager"
project(":plugins:package-managers:cargo").name = "cargo-package-manager"
project(":plugins:package-managers:gradle").name = "gradle-package-manager"
project(":plugins:package-managers:pub").name = "pub-package-manager"
project(":plugins:package-managers:python").name = "python-package-manager"
Expand Down

0 comments on commit 7818820

Please sign in to comment.