Skip to content

Commit 01383e0

Browse files
committed
Manually apply copyright differences from CI failure
1 parent 5b60a96 commit 01383e0

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 DiffPlug
2+
* Copyright 2016-2021 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -73,8 +73,8 @@ public FormatterStep createFrom(boolean wildcardsLast, File importsFile) {
7373

7474
private FormatterStep createFrom(boolean wildcardsLast, Supplier<List<String>> importOrder) {
7575
return FormatterStep.createLazy("importOrder",
76-
() -> new State(importOrder.get(), lineFormat, wildcardsLast),
77-
State::toFormatter);
76+
() -> new State(importOrder.get(), lineFormat, wildcardsLast),
77+
State::toFormatter);
7878
}
7979

8080
private static List<String> getImportOrder(File importsFile) {

lib/src/main/java/com/diffplug/spotless/java/ImportSorter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 DiffPlug
2+
* Copyright 2016-2021 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 DiffPlug
2+
* Copyright 2016-2021 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ private FormatterStep createStep() {
100100
ImportOrderStep importOrderStep = ImportOrderStep.forJava();
101101

102102
return importOrderFile != null
103-
? importOrderStep.createFrom(wildcardsLast, getProject().file(importOrderFile))
104-
: importOrderStep.createFrom(wildcardsLast, importOrder);
103+
? importOrderStep.createFrom(wildcardsLast, getProject().file(importOrderFile))
104+
: importOrderStep.createFrom(wildcardsLast, importOrder);
105105
}
106106
}
107107

0 commit comments

Comments
 (0)