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

Moe Sync #464

Merged
merged 2 commits into from
Jun 1, 2018
Merged

Moe Sync #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1420355
Remove <optional>true</optional> from annotation dependency.
cpovirk Jun 1, 2018
882b776
Update Truth to Guava 25.1.
dimo414 Jun 1, 2018
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
11 changes: 8 additions & 3 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<artifactId>truth</artifactId>
<name>Truth Core</name>
<properties>
<guava.version>23.6-android</guava.version>
<guava-gwt.version>23.6-jre</guava-gwt.version>
<guava.version>25.1-android</guava.version>
<guava-gwt.version>25.1-jre</guava-gwt.version>
<gwt.version>2.8.2</gwt.version>
<junit.version>4.12</junit.version>
<diffutils.version>1.3.0</diffutils.version>
Expand All @@ -30,7 +30,12 @@
<groupId>org.checkerframework</groupId>
<artifactId>checker-compat-qual</artifactId>
<version>${checker-framework.version}</version>
<optional>true</optional>
</dependency>
<!-- Manually add a dependency that guava-gwt needs but doesn't declare as of May 2018. -->
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>${checker-framework.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
4 changes: 4 additions & 0 deletions core/src/test/java/com/google/common/truth/ComparableSubjectCompileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ public void comparableMixedTypesDontCompile() {

assertAbout(javaSource())
.that(file)
// https://github.com/google/compile-testing/issues/149
.withCompilerOptions("-sourcepath", "")
.failsToCompile()
.withErrorContaining("java.lang.String cannot be converted to test.MyTest.ComparableType")
.in(file)
Expand Down Expand Up @@ -84,6 +86,8 @@ public void rawComparableTypeMixedTypes() {
"}");
assertAbout(javaSource())
.that(file)
// https://github.com/google/compile-testing/issues/149
.withCompilerOptions("-sourcepath", "")
.failsToCompile()
.withErrorContaining(
"java.lang.String cannot be converted to test.MyTest.RawComparableType")
Expand Down