Skip to content

Commit

Permalink
Address Scis review
Browse files Browse the repository at this point in the history
  • Loading branch information
marchermans committed Jun 17, 2024
1 parent 94a1ce0 commit b841a98
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,6 @@ private void applyAfterEvaluate(final Project project) {
}
});



definitionSet.forEach((identifier, definition) -> {
definition.configureRun(runImpl);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,22 +109,22 @@ public void execute() {
private record Monitor(GradleInternalUtils.ProgressLoggerWrapper progress) implements CopyProgressListener {

@Override
public void start(CopyProgressEvent evt) {
progress.started();
progress.incrementDownloadProgress(evt.getReadBytes());
}
public void start(CopyProgressEvent evt) {
progress.started();
progress.incrementDownloadProgress(evt.getReadBytes());
}

@Override
public void progress(CopyProgressEvent evt) {
progress.incrementDownloadProgress(evt.getReadBytes());
}
@Override
public void progress(CopyProgressEvent evt) {
progress.incrementDownloadProgress(evt.getReadBytes());
}

@Override
public void end(CopyProgressEvent evt) {
progress.incrementDownloadProgress(evt.getReadBytes());
progress.completed();
}
@Override
public void end(CopyProgressEvent evt) {
progress.incrementDownloadProgress(evt.getReadBytes());
progress.completed();
}
}

private static final class Timeout implements TimeoutConstraint {

Expand All @@ -143,9 +143,13 @@ public int getReadTimeout() {

public interface Params extends WorkParameters {
Property<String> getUrl();

Property<String> getSha1();

Property<Boolean> getShouldValidateHash();

RegularFileProperty getOutputFile();

Property<Boolean> getIsOffline();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ private void configureRunType(final Project project, final RunType runType, fina

runType.getClasspath().from(runtimeClasspath);

Provider<String> assetsDir = DownloadAssets.getAssetsDirectory(project, project.provider(runtimeDefinition::getVersionJson)).map(Directory::getAsFile).map(File::getAbsolutePath); // runtimeDefinition.getAssets().flatMap().map(Directory::getAsFile).map(File::getAbsolutePath);
Provider<String> assetsDir = DownloadAssets.getAssetsDirectory(project, project.provider(runtimeDefinition::getVersionJson)).map(Directory::getAsFile).map(File::getAbsolutePath);
Provider<String> assetIndex = runtimeDefinition.getAssets().flatMap(DownloadAssets::getAssetIndex);

runType.getRunAdapter().set(run -> {
Expand Down

0 comments on commit b841a98

Please sign in to comment.