|
@@ -72,20 +72,19 @@ public class InternalBwcGitPlugin implements Plugin<Project> {
|
|
|
createClone.commandLine("git", "clone", buildLayout.getRootDirectory(), gitExtension.getCheckoutDir().get());
|
|
|
});
|
|
|
|
|
|
- ExtraPropertiesExtension extraProperties = project.getExtensions().getExtraProperties();
|
|
|
TaskProvider<LoggedExec> findRemoteTaskProvider = tasks.register("findRemote", LoggedExec.class, findRemote -> {
|
|
|
findRemote.dependsOn(createCloneTaskProvider);
|
|
|
findRemote.getWorkingDir().set(gitExtension.getCheckoutDir());
|
|
|
findRemote.commandLine("git", "remote", "-v");
|
|
|
findRemote.getCaptureOutput().set(true);
|
|
|
- findRemote.doLast(t -> { extraProperties.set("remoteExists", isRemoteAvailable(remote, findRemote.getOutput())); });
|
|
|
+ findRemote.doLast(t -> System.setProperty("remoteExists", String.valueOf(isRemoteAvailable(remote, findRemote.getOutput()))));
|
|
|
});
|
|
|
|
|
|
TaskProvider<Task> addRemoteTaskProvider = tasks.register("addRemote", addRemote -> {
|
|
|
String rootProjectName = project.getRootProject().getName();
|
|
|
|
|
|
addRemote.dependsOn(findRemoteTaskProvider);
|
|
|
- addRemote.onlyIf("remote exists", task -> ((boolean) extraProperties.get("remoteExists")) == false);
|
|
|
+ addRemote.onlyIf("remote exists", task -> (Boolean.valueOf(providerFactory.systemProperty("remoteExists").get()) == false));
|
|
|
addRemote.doLast(new Action<Task>() {
|
|
|
@Override
|
|
|
public void execute(Task task) {
|