Skip to content

Standalone gradle plugins #48

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.

Sign up for GitHub

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

Merged
bulldozer-bot merged 17 commits into from
Oct 22, 2019
Merged

Standalone gradle plugins #48

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b87ec11
Fix licenses
iamdanfox Oct 22, 2019
9381f06
Split into 3 plugins
iamdanfox Oct 22, 2019
816e7e4
Merge remote-tracking branch 'origin/develop' into dfox/standalone-gr…
iamdanfox Oct 22, 2019
4341dba
Whatever
iamdanfox Oct 22, 2019
687ab71
formatDiff task has a real implementaiton
iamdanfox Oct 22, 2019
6b86211
New :-utils project
iamdanfox Oct 22, 2019
ab9d5da
Move applyReplacements to :utils
iamdanfox Oct 22, 2019
3da6143
Move lineRangesToCharRanges
iamdanfox Oct 22, 2019
ceda32a
gradle plugin depends on :spi
iamdanfox Oct 22, 2019
3775fac
I think everything compiles
iamdanfox Oct 22, 2019
d5c7b99
Seems like it works
iamdanfox Oct 22, 2019
8a24717
Remove configurability from Extension, move service loading
iamdanfox Oct 22, 2019
e6ddc3b
Undo utils
iamdanfox Oct 22, 2019
f3fff39
Minimal copypasta into gradle plugin
iamdanfox Oct 22, 2019
c3e865d
Fix up imports
iamdanfox Oct 22, 2019
7c85441
Test uses local classpath
iamdanfox Oct 22, 2019
4deff83
Add generated changelog entries
iamdanfox Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix up imports
  • Loading branch information
@iamdanfox
iamdanfox committed Oct 22, 2019
commit c3e865d42b126cd5478598ae87abed3f2cd0b71c
2 changes: 0 additions & 2 deletions ...alantir-java-format/src/main/java/com/palantir/javaformat/gradle/JavaFormatExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ServiceLoader;
import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.provider.Property;

public class JavaFormatExtension {
private final Configuration configuration;
Expand Down
4 changes: 0 additions & 4 deletions palantir-java-format/src/main/java/com/palantir/javaformat/java/Formatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
import com.google.common.collect.Range;
import com.google.common.collect.RangeSet;
import com.google.common.collect.TreeRangeSet;
import com.google.common.io.CharSink;
import com.google.common.io.CharSource;
import com.google.errorprone.annotations.Immutable;
Expand All @@ -36,9 +34,7 @@
import java.io.IOError;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.openjdk.javax.tools.Diagnostic;
import org.openjdk.javax.tools.DiagnosticCollector;
import org.openjdk.javax.tools.DiagnosticListener;
Expand Down
3 changes: 0 additions & 3 deletions palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaOutput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

package com.palantir.javaformat.java;

import static java.util.Comparator.comparing;

import com.google.common.base.CharMatcher;
import com.google.common.base.MoreObjects;
import com.google.common.collect.DiscreteDomain;
Expand All @@ -30,7 +28,6 @@
import com.palantir.javaformat.OpsBuilder.BlankLineWanted;
import com.palantir.javaformat.Output;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down
3 changes: 2 additions & 1 deletion palantir-java-format/src/test/java/com/palantir/javaformat/NewlinesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public void lines() {
Truth.assertThat(ImmutableList.copyOf(Newlines.lineIterator("foo\rbar\r"))).containsExactly("foo\r", "bar\r");
Truth.assertThat(ImmutableList.copyOf(Newlines.lineIterator("foo\rbar"))).containsExactly("foo\r", "bar");

Truth.assertThat(ImmutableList.copyOf(Newlines.lineIterator("foo\r\nbar\r\n"))).containsExactly("foo\r\n", "bar\r\n");
Truth.assertThat(ImmutableList.copyOf(Newlines.lineIterator("foo\r\nbar\r\n")))
.containsExactly("foo\r\n", "bar\r\n");
Truth.assertThat(ImmutableList.copyOf(Newlines.lineIterator("foo\r\nbar"))).containsExactly("foo\r\n", "bar");
}

Expand Down