-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
Auto build gradle lib-project dependencies #821
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
55939ef
Auto build gradle lib-project dependencies
loosebazooka 43c4669
Update changelog
loosebazooka 5538a65
fix ordering, make test better
loosebazooka 26893d0
Merge branch 'master' into multi-module-gradle
loosebazooka 371b7cb
ordering
loosebazooka 5ebc852
Merge branch 'master' into multi-module-gradle
loosebazooka File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,11 +17,17 @@ | |
package com.google.cloud.tools.jib.gradle; | ||
|
||
import com.google.common.annotations.VisibleForTesting; | ||
import java.util.List; | ||
import java.util.stream.Collectors; | ||
import org.gradle.api.GradleException; | ||
import org.gradle.api.Plugin; | ||
import org.gradle.api.Project; | ||
import org.gradle.api.Task; | ||
import org.gradle.api.UnknownTaskException; | ||
import org.gradle.api.artifacts.Configuration; | ||
import org.gradle.api.artifacts.DependencySet; | ||
import org.gradle.api.artifacts.ProjectDependency; | ||
import org.gradle.api.plugins.BasePlugin; | ||
import org.gradle.util.GradleVersion; | ||
|
||
public class JibPlugin implements Plugin<Project> { | ||
|
@@ -66,12 +72,14 @@ public void apply(Project project) { | |
project.afterEvaluate( | ||
projectAfterEvaluation -> { | ||
try { | ||
List<Task> taskDependencies = getProjectDependencyAssembleTasks(projectAfterEvaluation); | ||
Task classesTask = projectAfterEvaluation.getTasks().getByPath("classes"); | ||
taskDependencies.add(classesTask); | ||
|
||
buildImageTask.dependsOn(classesTask); | ||
dockerContextTask.dependsOn(classesTask); | ||
buildDockerTask.dependsOn(classesTask); | ||
buildTarTask.dependsOn(classesTask); | ||
buildImageTask.dependsOn(taskDependencies.toArray()); | ||
dockerContextTask.dependsOn(taskDependencies.toArray()); | ||
buildDockerTask.dependsOn(taskDependencies.toArray()); | ||
buildTarTask.dependsOn(taskDependencies.toArray()); | ||
|
||
} catch (UnknownTaskException ex) { | ||
throw new GradleException( | ||
|
@@ -83,6 +91,28 @@ public void apply(Project project) { | |
}); | ||
} | ||
|
||
/** | ||
* Collects all assemble tasks for project dependencies of the style "compile project(':mylib')" | ||
* for any kind of configuration [compile, runtime, etc]. It potentially will collect common test | ||
* libraries in configs like [test, integrationTest, etc], but it's either that or filter based on | ||
* a configuration containing the word "test" which feels dangerous. | ||
* | ||
* @param project this project we are containerizing | ||
* @return a list of "assemble" tasks associated with projects that this project depends on. | ||
*/ | ||
static List<Task> getProjectDependencyAssembleTasks(Project project) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: Order above non-static and annotate with |
||
return project | ||
.getConfigurations() | ||
.stream() | ||
.map(Configuration::getDependencies) | ||
.flatMap(DependencySet::stream) | ||
.filter(ProjectDependency.class::isInstance) | ||
.map(ProjectDependency.class::cast) | ||
.map(ProjectDependency::getDependencyProject) | ||
.map(subProject -> subProject.getTasks().getByPath(BasePlugin.ASSEMBLE_TASK_NAME)) | ||
.collect(Collectors.toList()); | ||
} | ||
|
||
private static void checkGradleVersion() { | ||
if (GRADLE_MIN_VERSION.compareTo(GradleVersion.current()) > 0) { | ||
throw new GradleException( | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can use
setDependsOn
to avoidtoArray
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That overwrites any previously dependencies.
For instance in a build.gradle like
the build using
setDependsOn
will not honor themyCustomTask
dependency.