Skip to content

Gradle: improve dependency detection #540

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

Merged
olafurpg merged 7 commits into from
Apr 14, 2023
Merged

Gradle: improve dependency detection #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1684eda
Get Bazel build working again
olafurpg Apr 14, 2023
2698e2c
Gradle: improve dependency detection
olafurpg Mar 30, 2023
343a121
Add tests
olafurpg Mar 30, 2023
950a928
Catch exceptions from resolution
olafurpg Mar 30, 2023
89aa93c
Remove unintended diff
olafurpg Mar 31, 2023
247fd34
Specify Gradle version for new test
olafurpg Apr 14, 2023
974a9c7
Empty commit to trigger ci
olafurpg Apr 14, 2023
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
1 change: 1 addition & 0 deletions examples/bazel-example/.bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.2.0
64 changes: 30 additions & 34 deletions scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/GradleBuildTool.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,40 +216,7 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
| }
| }
| }
| task $scipJavaDependencies {
| def depsOut = java.nio.file.Paths.get(
| java.net.URI.create('${dependenciesPath.toUri}'))
| doLast {
| java.nio.file.Files.createDirectories(depsOut.getParent())
| tasks.withType(JavaCompile) {
| try {
| configurations.each { config ->
| def artifactType = org.gradle.api.attributes.Attribute.of("artifactType", String.class)
| def attributeType = "jar"
| if (config.canBeResolved) {
| def artifacts = config.incoming.artifactView { view ->
| view.lenient = true
| view.attributes { container ->
| container.attribute(artifactType, attributeType)
| }
| }.artifacts
| def lines = artifacts.collect {
| def id = it.id.componentIdentifier
| return "$$id.group\t$$id.module\t$$id.version\t$$it.file"
| }
| java.nio.file.Files.write(
| depsOut,
| lines.unique(false),
| java.nio.file.StandardOpenOption.APPEND,
| java.nio.file.StandardOpenOption.CREATE)
| }
| }
| } catch (Exception e) {
| // Ignore errors.
| }
| }
| }
| }
| task $scipJavaDependencies(type: WriteDependencies)
|}
|def scipJavaSemanticdbScalacVersions(scalaVersion) {
| ${semanticdbScalacGroovySyntax()}[scalaVersion]
Expand All @@ -273,6 +240,35 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
| }
| return null
|}
|
|class WriteDependencies extends DefaultTask {
| @TaskAction
| void printResolvedDependencies() {
| def depsOut = java.nio.file.Paths.get(
| java.net.URI.create('${dependenciesPath.toUri}'))
| java.nio.file.Files.createDirectories(depsOut.getParent())
| def configurations = project.configurations
| configurations.each { configuration ->
| if (!configuration.canBeResolved || java.lang.reflect.Modifier.isAbstract(configuration.getClass().getModifiers())) {
| return
| }
| try {
| def resolvedConfiguration = configuration.resolvedConfiguration
| def lines = resolvedConfiguration.resolvedArtifacts.collect { artifact ->
| return "$$artifact.moduleVersion.id.group\t$$artifact.moduleVersion.id.name\t$$artifact.moduleVersion.id.version\t$$artifact.file.absolutePath"
| }
| java.nio.file.Files.write(
| depsOut,
| lines.unique(false),
| java.nio.file.StandardOpenOption.APPEND,
| java.nio.file.StandardOpenOption.CREATE)
| } catch (Exception e) {
| println "Skipping configuration '$$configuration.name' due to resolution failure: $$e.message"
| return
| }
| }
| }
|}
|""".stripMargin
Files.write(
tmp.resolve("init-script.gradle"),
Expand Down
46 changes: 46 additions & 0 deletions tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,52 @@ class GradleBuildToolSuite extends BaseBuildToolSuite {
initCommand = gradleVersion()
)

checkBuild(
"implementation-deps",
"""|/settings.gradle
|rootProject.name = 'marklogic-examples'
|include('app')
|/app/build.gradle
|plugins {
| id 'java-library'
|}
|repositories {
| mavenCentral()
|}
|dependencies {
| implementation 'com.marklogic:marklogic-client-api:6.1.0'
|}
|/app/src/main/java/foo/Methods.java
|package foo;
|import com.marklogic.client.admin.MethodType;
|public class Methods {
| MethodType foo;
|}
|""".stripMargin,
expectedSemanticdbFiles = 1,
expectedPackages =
"""|maven:com.fasterxml.jackson.core:jackson-annotations:2.14.1
|maven:com.fasterxml.jackson.core:jackson-core:2.14.1
|maven:com.fasterxml.jackson.core:jackson-databind:2.14.1
|maven:com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.14.1
|maven:com.marklogic:marklogic-client-api:6.1.0
|maven:com.squareup.okhttp3:logging-interceptor:4.10.0
|maven:com.squareup.okhttp3:okhttp:4.10.0
|maven:com.squareup.okio:okio-jvm:3.0.0
|maven:com.sun.mail:javax.mail:1.6.2
|maven:io.github.rburgst:okhttp-digest:2.7
|maven:javax.activation:activation:1.1
|maven:javax.ws.rs:javax.ws.rs-api:2.1.1
|maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
|maven:org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10
|maven:org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10
|maven:org.jetbrains.kotlin:kotlin-stdlib:1.6.20
|maven:org.jetbrains:annotations:13.0
|maven:org.slf4j:slf4j-api:1.7.36
|""".stripMargin,
initCommand = gradleVersion()
)

List("8", "11").foreach { version =>
checkBuild(
s"kotlin-jvm-toolchains-jdk-$version",
Expand Down