Skip to content

Commit

Permalink
Excavator: Upgrades Baseline to the latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
svc-excavator-bot committed Sep 26, 2019
1 parent 5626edd commit 892b2b4
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .baseline/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
<module name="NestedTryDepth"/> <!-- Java Coding Guide: Try/catch blocks: never nested -->
<module name="NonEmptyAtclauseDescription"/> <!-- Java Style Guide: At-clauses -->
<module name="ParameterName"> <!-- Java Style Guide: Parameter names -->
<property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
<property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
<message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->
Expand Down
3 changes: 2 additions & 1 deletion .baseline/spotless/eclipse.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
Expand Down Expand Up @@ -177,7 +178,7 @@
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="48"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="80"/>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ buildscript {
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.netflix.nebula:nebula-publishing-plugin:13.6.1'
classpath 'com.palantir.baseline:gradle-baseline-java:2.3.0'
classpath 'com.palantir.baseline:gradle-baseline-java:2.13.0'
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
public class CompileConjurePythonTask extends ConjureGeneratorTask {

@Override
protected final Map<String, Supplier<Object>> requiredOptions(File file) {
protected final Map<String, Supplier<Object>> requiredOptions(File _file) {
return ImmutableMap.of(
"packageName",
this::getProjectName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void execute(Task task) {
}

@Override
protected final Map<String, Supplier<Object>> requiredOptions(File file) {
protected final Map<String, Supplier<Object>> requiredOptions(File _file) {
return ImmutableMap.of(
"packageName",
this::getPackageName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public ConjureGeneratorTask() {
// main task. Intentionally not using a lambda because this breaks Gradle caching
doLast(new Action<Task>() {
@Override
public void execute(Task task) {
public void execute(Task _task) {
compileFiles();
}
});
Expand Down Expand Up @@ -83,7 +83,7 @@ public final GeneratorOptions getOptions() {
* Where to put the output for the given input source file.
* This should return a directory that's under {@link #getOutputDirectory()}.
*/
protected File outputDirectoryFor(File file) {
protected File outputDirectoryFor(File _file) {
return getOutputDirectory();
}

Expand Down Expand Up @@ -116,7 +116,7 @@ public void compileFiles() {
* What options are required, along with suppliers for obtaining their default values if they were not defined in
* the {@link #getOptions() options}.
*/
protected Map<String, Supplier<Object>> requiredOptions(File file) {
protected Map<String, Supplier<Object>> requiredOptions(File _file) {
return ImmutableMap.of();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ private static Copy getConjureSources(Project project) {
// (see https://github.com/gradle/gradle/issues/5510)
copyConjureSourcesTask.doFirst(new Action<Task>() {
@Override
public void execute(Task task) {
public void execute(Task _task) {
GFileUtils.deleteDirectory(buildDir);
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public ExtractExecutableTask() {

doFirst(new Action<Task>() {
@Override
public void execute(Task task) {
public void execute(Task _task) {
Set<String> rootDirectories = new HashSet<>();
getProject().tarTree(tarFile.get()).visit(new FileVisitor() {
@Override
Expand All @@ -71,7 +71,7 @@ public void visitDir(FileVisitDetails dirDetails) {
}

@Override
public void visitFile(FileVisitDetails fileDetails) {}
public void visitFile(FileVisitDetails _fileDetails) {}
});
if (rootDirectories.size() != 1) {
throw new GradleException(String.format(
Expand All @@ -84,7 +84,7 @@ public void visitFile(FileVisitDetails fileDetails) {}

doLast(new Action<Task>() {
@Override
public void execute(Task task) {
public void execute(Task _task) {
getLogger().info("Extracted into {}", getOutputDirectory());
// Ensure the executable exists
Preconditions.checkState(
Expand Down

0 comments on commit 892b2b4

Please sign in to comment.