add classifier and extension to coordinate #87
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
darora
reviewed
Aug 31, 2017
| } | ||
|
|
||
| dependencies | ||
| } | ||
|
|
| @@ -126,6 +143,7 @@ class GradleDependencyGenerator { | |||
|
|
|||
| gradleRoot.mkdirs() | |||
| def rootBuildGradle = new File(gradleRoot, BUILD_GRADLE) | |||
|
|
|||
| @@ -156,6 +174,8 @@ class GradleDependencyGenerator { | |||
| version = '${node.version}' | |||
| ext { | |||
| artifactName = '${node.artifact}' | |||
| extensionName = '${node.extension? node.extension: "jar"}' | |||
| classifierName = ${node.classifier? "'" + node.classifier + "'": null} | |||
| @@ -240,6 +328,8 @@ class GradleDependencyGeneratorSpec extends Specification { | |||
| block == expectedBlock | |||
| } | |||
|
|
|||
| // todo: make some changes down here for classifier and extension | |||
| dep.classifier == 'bar' | ||
| dep.extension == 'zip' | ||
| } | ||
|
|
| module.extension == null | ||
| module.dependencies.size() == 0 | ||
| } | ||
|
|
| def repo = new File(directory) | ||
| new File(repo, 'test.maven.foo_1_0_0/build.gradle').text.contains 'compile \'test.maven:bar:1.+:baz@zip\'' | ||
| def pom = new File(repo, 'mavenrepo/test/maven/foo/1.0.0/foo-1.0.0.pom').text | ||
| pom.contains '<groupId>test.maven</groupId>' |
There was a problem hiding this comment.
almost seems like you want to test that the entire block exists. Once you strip whitespace/newlines you should be able to test for contains
| def repo = new File(directory) | ||
| new File(repo, 'test.ivy.foo_1_0_0/build.gradle').text.contains 'compile \'test.ivy:bar:1.1.0:baz@zip\'' | ||
| def xml = new File(repo, 'ivyrepo/test/ivy/foo/1.0.0/foo-1.0.0-ivy.xml').text | ||
| xml.contains '<dependency org="test.ivy" name="bar" rev="1.1.0" conf="compile->default" transitive="false">' |
|
@DanielThomas @rspieldenner could you take a look at this as well? |
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.
Fixes #85