Skip to content

Commit c124fc6

Browse files
cushonError Prone Team
authored and
Error Prone Team
committed
Remove separate type_annotations artifact
And merge type_annotations in annotations. The annotations artifact is still Java 8 compatible. The type_annotations artifact was created when annotations was Java 7-compatible, to allow using Java 8 annotation APIs (like `@Target(TYPE_USE)`). This avoids split package issues when using Error Prone annotations from modularized builds, see e.g. #4888 Tested: TAP for global presubmit queue [] PiperOrigin-RevId: 737500755
1 parent baf0e0a commit c124fc6

File tree

5 files changed

+0
-68
lines changed

5 files changed

+0
-68
lines changed

core/pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@
4949
<artifactId>error_prone_annotation</artifactId>
5050
<version>${project.version}</version>
5151
</dependency>
52-
<dependency>
53-
<!-- Apache 2.0 -->
54-
<groupId>com.google.errorprone</groupId>
55-
<artifactId>error_prone_type_annotations</artifactId>
56-
<version>${project.version}</version>
57-
</dependency>
5852
<dependency>
5953
<!-- Apache 2.0 -->
6054
<groupId>com.google.errorprone</groupId>
@@ -424,7 +418,6 @@
424418
<include>com.github.kevinstern:software-and-algorithms</include>
425419
<include>com.google.errorprone:error_prone_annotation</include>
426420
<include>com.google.errorprone:error_prone_annotations</include>
427-
<include>com.google.errorprone:error_prone_type_annotations</include>
428421
<include>com.google.errorprone:error_prone_check_api</include>
429422
<include>org.pcollections:pcollections</include>
430423
<include>com.google.guava:guava</include>

pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
<module>core</module>
6666
<module>annotation</module>
6767
<module>annotations</module>
68-
<module>type_annotations</module>
6968
<module>docgen</module>
7069
<module>docgen_processor</module>
7170
<module>refaster</module>

type_annotations/pom.xml

-60
This file was deleted.

0 commit comments

Comments
 (0)