Skip to content
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

Global dependency graph #3913

Merged
merged 11 commits into from
May 12, 2021
Merged

Global dependency graph #3913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ad79529
PackageManager: Introduce a result class for resolved dependencies
oheger-bosch Apr 19, 2021
2ddca4d
PackageManager: Add a function to create the final result
oheger-bosch Apr 19, 2021
dd15449
Rework the tests for the Gradle package manager
oheger-bosch Apr 20, 2021
31ecf4a
DependencyGraph: Add functionality to generate qualified scope names
oheger-bosch Apr 21, 2021
7b642de
DependencyGraph: Add a conversion function for a subset of scopes
oheger-bosch Apr 20, 2021
d0383db
Project: Prepare for using a shared dependency graph
oheger-bosch Apr 21, 2021
cee405c
AnalyzerResultBuilder: Expose a function to add packages
oheger-bosch May 10, 2021
6381cfa
Extend AnalyzerResult to support shared DependencyGraphs
oheger-bosch May 10, 2021
b946e94
Gradle: Construct a shared dependency graph
oheger-bosch Apr 22, 2021
2f792e3
Project: Drop support for a project-local dependency graph
oheger-bosch Apr 22, 2021
39ce120
OrtMain: Invoke withResolvedScopes() in readOrtResult()
oheger-bosch May 11, 2021
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
293 changes: 210 additions & 83 deletions analyzer/src/funTest/assets/projects/external/multi-kotlin-project-expected-output-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,95 +15,222 @@ project:
revision: "<REPLACE_REVISION>"
path: "analyzer/src/funTest/assets/projects/external/multi-kotlin-project/cli"
homepage_url: ""
dependency_graph:
packages:
- "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
- "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
- "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- "Maven:org.jetbrains:annotations:13.0"
- "Maven:org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.11"
- "Maven:org.jetbrains.kotlin:kotlin-script-runtime:1.3.11"
- "Maven:org.jetbrains.kotlin:kotlin-reflect:1.3.11"
- "Maven:org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.3.11"
scope_roots:
- dependencies:
- pkg: 1
scopes:
- name: "annotationProcessor"
dependencies: []
- name: "apiDependenciesMetadata"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- pkg: 2
- pkg: 3
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "archives"
dependencies: []
- name: "compile"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
- pkg: 4
dependencies:
- pkg: 1
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- pkg: 2
- pkg: 3
- pkg: 5
- pkg: 6
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "compileClasspath"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- pkg: 1
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "compileOnly"
dependencies: []
- name: "compileOnlyDependenciesMetadata"
dependencies: []
- name: "default"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "implementationDependenciesMetadata"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "kapt"
dependencies: []
- name: "kaptTest"
dependencies: []
- name: "kotlinCompilerClasspath"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-reflect:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- pkg: 2
- pkg: 3
- pkg: 7
scopes:
annotationProcessor: []
apiDependenciesMetadata:
- root: 0
- root: 1
archives: []
compile:
- root: 0
- root: 1
compileClasspath:
- root: 0
- root: 1
compileOnly: []
compileOnlyDependenciesMetadata: []
default:
- root: 0
- root: 1
implementationDependenciesMetadata:
- root: 0
- root: 1
kapt: []
kaptTest: []
kotlinCompilerClasspath:
- root: 4
kotlinCompilerPluginClasspath:
- root: 7
kotlinNativeCompilerPluginClasspath: []
kotlinScriptDef: []
runtime:
- root: 0
- root: 1
runtimeClasspath:
- root: 0
- root: 1
runtimeOnlyDependenciesMetadata: []
testAnnotationProcessor: []
testApiDependenciesMetadata:
- root: 0
- root: 1
testCompile:
- root: 0
- root: 1
testCompileClasspath:
- root: 0
- root: 1
testCompileOnly: []
testCompileOnlyDependenciesMetadata: []
testImplementationDependenciesMetadata:
- root: 0
- root: 1
testKotlinScriptDef: []
testRuntime:
- root: 0
- root: 1
testRuntimeClasspath:
- root: 0
- root: 1
testRuntimeOnlyDependenciesMetadata: []
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-script-runtime:1.3.11"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "kotlinCompilerPluginClasspath"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.3.11"
- name: "kotlinNativeCompilerPluginClasspath"
dependencies: []
- name: "kotlinScriptDef"
dependencies: []
- name: "runtime"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "runtimeClasspath"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "runtimeOnlyDependenciesMetadata"
dependencies: []
- name: "testAnnotationProcessor"
dependencies: []
- name: "testApiDependenciesMetadata"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "testCompile"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "testCompileClasspath"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "testCompileOnly"
dependencies: []
- name: "testCompileOnlyDependenciesMetadata"
dependencies: []
- name: "testImplementationDependenciesMetadata"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "testKotlinScriptDef"
dependencies: []
- name: "testRuntime"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "testRuntimeClasspath"
dependencies:
- id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0"
linkage: "PROJECT_DYNAMIC"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
dependencies:
- id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11"
- id: "Maven:org.jetbrains:annotations:13.0"
- name: "testRuntimeOnlyDependenciesMetadata"
dependencies: []
packages:
- id: "Maven:org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.11"
purl: "pkg:maven/org.jetbrains.kotlin/[email protected]"
Expand Down
Loading