|
107 | 107 | <groupId>org.checkerframework</groupId>
|
108 | 108 | <artifactId>checker-qual</artifactId>
|
109 | 109 | </dependency>
|
110 |
| - <dependency> |
111 |
| - <groupId>org.checkerframework</groupId> |
112 |
| - <artifactId>checker-qual</artifactId> |
113 |
| - <classifier>sources</classifier> |
114 |
| - </dependency> |
115 | 110 | </dependencies>
|
116 | 111 | <build>
|
117 | 112 | <plugins>
|
|
134 | 129 | <!-- 2. Don't include the source in the jar (since that would let users depend on it from GWT client code, which is compiled from source). -->
|
135 | 130 | <exclude>**/ForceGuavaCompilation*</exclude>
|
136 | 131 | <exclude>**/DummyJavadocClass*</exclude>
|
137 |
| - <!-- (unrelated interruption: Also don't include our fabricated CF GWT module descriptor. --> |
138 |
| - <exclude>**/Qual.gwt.xml</exclude> |
139 | 132 | </excludes>
|
140 | 133 | </configuration>
|
141 | 134 | </plugin>
|
|
146 | 139 | <!-- 3. Don't include it in the source jar (since it's really more of a "test" than it is production code). -->
|
147 | 140 | <exclude>**/ForceGuavaCompilation*</exclude>
|
148 | 141 | <exclude>**/DummyJavadocClass*</exclude>
|
149 |
| - <!-- (unrelated interruption: Also don't include our fabricated CF GWT module descriptor. I don't think anyone should be using our *sources* jar, anyway, at least not as an input to GWT compilation, but it seems safest to exclude here, just as we do for maven-jar-plugin, to be safe. --> |
150 |
| - <exclude>**/Qual.gwt.xml</exclude> |
151 | 142 | </excludes>
|
152 | 143 | </configuration>
|
153 | 144 | </plugin>
|
|
308 | 299 | <include name="**/InternalFutureFailureAccess.java" />
|
309 | 300 | </fileset>
|
310 | 301 | </copy>
|
311 |
| - <!-- We fabricate a GWT module to cover the CF annotations. Then we inherit it in ForceGuavaCompilation.gwt.xml. --> |
312 |
| - <echo file="${project.build.directory}/guava-gwt-sources/org/checkerframework/checker/nullness/qual/Qual.gwt.xml"> |
313 |
| - <module><source path="" /></module> |
314 |
| - </echo> |
315 |
| - <!-- TODO(cpovirk): DO NOT RELEASE in this state: I suspect that downstream users of guava-gwt will see their compilation fail from the "missing" CF annotations (whether because those sources are missing entirely or because they're present but without a module descriptor). --> |
316 |
| - <!-- In contrast to what we do with our *own* sources (i.e., those from guava, guava-testlib, and guava-tests), we *don't* copy the CF annotations to guava-gwt-sources (and so we don't need to unpack them ourselves at all). If we did, they would end up in our generated jar. And we don't need to, anyway: The GWT plugin picks them up automatically because of the <classifier>source</classifier> dependency above. --> |
317 | 302 | <copy toDir="${project.build.directory}/guava-test-gwt-sources">
|
318 | 303 | <fileset dir="${project.build.directory}/guava-test-sources">
|
319 | 304 | <contains text="@GwtCompatible"/>
|
320 | 305 | </fileset>
|
321 | 306 | </copy>
|
| 307 | + <replace token="@Nullable" value=""> |
| 308 | + <fileset dir="${project.build.directory}"> |
| 309 | + <include name="guava-gwt-sources/**/*.java"/> |
| 310 | + <include name="guava-test-gwt-sources/**/*.java"/> |
| 311 | + </fileset> |
| 312 | + </replace> |
322 | 313 | </target>
|
323 | 314 | </configuration>
|
324 | 315 | </execution>
|
|
0 commit comments