Skip to content
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

Update GWT,Guave,Auto,JavaPoet et al to latest #2

Closed
wants to merge 1 commit into from
Closed

Update GWT,Guave,Auto,JavaPoet et al to latest #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<gwt.version>2.7.0</gwt.version>
<gwt.version>2.8.2</gwt.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -76,23 +76,23 @@
<dependency>
<groupId>com.google.auto</groupId>
<artifactId>auto-common</artifactId>
<version>0.4</version>
<version>0.8</version>
</dependency>
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<version>1.0-rc2</version>
<version>1.0-rc3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup</groupId>
<artifactId>javapoet</artifactId>
<version>1.1.0</version>
<version>1.9.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
<version>23.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -103,13 +103,13 @@
<dependency>
<groupId>com.google.testing.compile</groupId>
<artifactId>compile-testing</artifactId>
<version>0.7</version>
<version>0.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.12.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/ltgt/gwt/place/processor/PlaceHistoryMapperProcessingStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import javax.tools.Diagnostic;

import com.google.auto.common.BasicAnnotationProcessor.ProcessingStep;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.SetMultimap;
import com.google.gwt.place.impl.AbstractPlaceHistoryMapper;
import com.google.gwt.place.shared.PlaceTokenizer;
Expand Down Expand Up @@ -70,7 +71,7 @@ public Set<? extends Class<? extends Annotation>> annotations() {
return Collections.singleton(WithTokenizers.class);
}

public void process(SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
public Set<Element> process(SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
for (Element element : elementsByAnnotation.get(WithTokenizers.class)) {
PlaceHistoryGeneratorContext context = PlaceHistoryGeneratorContext.create(messager, types, elements, element);
if (context == null) {
Expand All @@ -87,6 +88,7 @@ public void process(SetMultimap<Class<? extends Annotation>, Element> elementsBy
messager.printMessage(Diagnostic.Kind.ERROR, sw.toString());
}
}
return ImmutableSet.of();
}

private void generate(PlaceHistoryGeneratorContext context) throws IOException {
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/ltgt/gwt/place/processor/PrefixProcessingStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.google.auto.common.AnnotationMirrors;
import com.google.auto.common.BasicAnnotationProcessor.ProcessingStep;
import com.google.auto.common.MoreElements;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.SetMultimap;
import com.google.gwt.place.shared.PlaceTokenizer;
import com.google.gwt.place.shared.Prefix;
Expand All @@ -42,7 +43,7 @@ public Set<? extends Class<? extends Annotation>> annotations() {
}

@Override
public void process(SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
public Set<Element> process(SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
Set<Element> elements = elementsByAnnotation.get(Prefix.class);
for (Element element : elements) {
switch (element.getKind()) {
Expand Down Expand Up @@ -78,5 +79,6 @@ public void process(SetMultimap<Class<? extends Annotation>, Element> elementsBy
}
} // else error should be reported by the compiler
}
return ImmutableSet.of();
}
}