Commit 06c82ef
Don't put two copies of every class into the Guava jar.
We need to compile Guava twice:
- once to build the actual classes with `-source 8` (to maintain Java 8 compatibility)
- once to build `module-info`, which requires `-source 9` and thus is incompatible with the "main" build
I had been under the mistaken impression that the latter compile still needed to pass all the sources. As a result, we had the second compile build `module-info` _and_ all the classes. We then had configuration in `maven-jar-plugin` to ignore the other classes.
But the `maven-jar-plugin` configuration doesn't help because we're using `maven-bundle-plugin` instead, at least for the `guava` itself. (I didn't look into `guava-testlib`, `guava-gwt`, or the tests of any module, though note that (IIRC) the only other one that's modularized (and thus might benefit from our module-related `maven-jar-plugin` configuration) is `guava-testlib`.)
Luckily, it turns out that we _can_ compile `module-info` by itself. So now the build does that.
(Also, bump `maven-jar-plugin` while in the area.)
See #6614 (comment)
RELNOTES=Removed the extra copy of each class from the Guava jar. The extra copies were an accidental addition from the modularization work in [Guava 33.4.5](https://github.com/google/guava/releases/tag/v33.4.5).
PiperOrigin-RevId: 7400053641 parent 2aaa454 commit 06c82ef
4 files changed
+10
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
119 | 119 | | |
120 | 120 | | |
121 | 121 | | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
122 | 125 | | |
123 | 126 | | |
124 | 127 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
233 | 233 | | |
234 | 234 | | |
235 | 235 | | |
236 | | - | |
| 236 | + | |
237 | 237 | | |
| 238 | + | |
238 | 239 | | |
239 | 240 | | |
240 | 241 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
119 | 119 | | |
120 | 120 | | |
121 | 121 | | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
122 | 125 | | |
123 | 126 | | |
124 | 127 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
234 | 234 | | |
235 | 235 | | |
236 | 236 | | |
237 | | - | |
| 237 | + | |
238 | 238 | | |
| 239 | + | |
239 | 240 | | |
240 | 241 | | |
241 | 242 | | |
| |||
0 commit comments