Skip to content

Conversation

@renovate
Copy link
Contributor

@renovate renovate bot commented Feb 25, 2025

This PR contains the following updates:

Package Update Change
gradle (source) minor 8.12.1 -> 8.13

Release Notes

gradle/gradle (gradle)

v8.13

Compare Source


Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR was generated by Mend Renovate. View the repository job log.

@renovate renovate bot requested a review from a team February 25, 2025 11:38
@renovate renovate bot force-pushed the renovate/gradle-8.x branch from 1f37cb3 to 50798ff Compare March 3, 2025 11:49
@renovate
Copy link
Contributor Author

renovate bot commented Mar 7, 2025

Edited/Blocked Notification

Renovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR.

You can manually request rebase by checking the rebase/retry box above.

⚠️ Warning: custom changes will be lost.

@laurit
Copy link
Contributor

laurit commented Mar 7, 2025

@LikeTheSalad @zeitlinger wire plugin doesn't seem to work with gradle 8.13 when srcJar is used, srcDir work. I have replaced srcJar with downloading the protos archive, copied from opentelemetry-proto-java, and srcDir. You are welcome to work with the authors of the wire plugin or come up with a different solution.

}

val protoVersion = "1.5.0"
val protoArchive = layout.buildDirectory.file("archives/opentelemetry-proto-$protoVersion.zip").get().asFile
Copy link
Contributor

@LikeTheSalad LikeTheSalad Mar 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @laurit! Although I think it's better if we don't have to rely on third-party plugins. I was checking and I think we could make it work by replacing the wire block with the following changes, wdyt?

val wireDependencies =
  configurations.detachedConfiguration(project.dependencies.create("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha"))
wireDependencies.setTransitive(false)

val wireSrcDirCollector = tasks.register("wireSrcJarCollect", Sync::class) {
  from(provider {
    wireDependencies.map {
      zipTree(it).matching {
        setIncludes(listOf("**/*.proto"))
      }
    }
  })
  into(layout.buildDirectory.dir("protos/opentelemetry-proto"))
}

wire {
  java {}

  sourcePath {
    srcDir(wireSrcDirCollector)
  }

  root(
    "opentelemetry.proto.trace.v1.TracesData",
    "opentelemetry.proto.metrics.v1.MetricsData",
    "opentelemetry.proto.logs.v1.LogsData",
  )
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the dependency on the download task. If you believe further changes are needed create a PR. We can merge that PR and recreate this one.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. If the build passes, I'm ok with leaving it as is. Though if there are further issues, I'll create a separate PR, as you suggest, to sort them out.

@trask trask merged commit d2cdd29 into main Mar 7, 2025
19 checks passed
@trask trask deleted the renovate/gradle-8.x branch March 7, 2025 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants