merge ianoc with master #321
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Implements Maven URL when resolving artifacts
…a notion of bazels digest
Closed
|
I think the main thing to review is here: There are a lot of formatting changes you can ignore. |
eed3si9n
reviewed
Feb 28, 2023
Comment on lines
+60
to
+76
| // Gradle has compile/runtime/test sepearate classpaths | ||
| // we just want one, so we merge them all | ||
| private def collapseDepTypes( | ||
| lockFile: GradleLockFile | ||
| ): Try[Map[String, GradleLockDependency]] = | ||
| List( | ||
| lockFile.compileClasspath, | ||
| lockFile.annotationProcessor, | ||
| lockFile.resolutionRules, | ||
| lockFile.runtimeClasspath, | ||
| lockFile.testCompileClasspath, | ||
| lockFile.testRuntimeClasspath | ||
| ) | ||
| .map(_.getOrElse(Map())) | ||
| .foldLeft(Try(Map[String, GradleLockDependency]())) { case (p, n) => | ||
| p.flatMap { s => TryMerge.tryMerge(None, s, n) } | ||
| } |
There was a problem hiding this comment.
Does this mean that the transitive dependencies of test dependencies could override the compile configuration? This could potentially cause prod differences between Gradle and Bazel.
There was a problem hiding this comment.
yes, that's what it means. It's intentional. We can discuss later. We want a single version of all the jars. In fact, gradle having a different version for each project main and test has caused prod issues: we know these jars will be combined at runtime, so ignoring that and letting them transitively get different dependencies at compile and test time is asking for trouble.
eed3si9n
approved these changes
Feb 28, 2023
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I did a minimal amount of change to get the code to pass tests (and rewrote some custom implementations of traverse).