feat: add io.leangen.geantyref (#30)

Adds the `io.leangen.geantyref` project to the repository, after
applying PR leangen/geantyref#29

Relates-To: leangen/geantyref#29

Signed-off-by: Sam Gammon <sam@elide.ventures>

Author: sgammon

.gitmodules

@@ -46,3 +46,6 @@
 [submodule "gson"]
 	path = tests/integration/gson
 	url = git@github.com:google/gson.git
+[submodule "geantyref"]
+	path = io.leangen.geantyref
+	url = git@github.com:javamodules/geantyref.git

Makefile

@@ -18,12 +18,14 @@ export GUAVA_VERSION ?= 1.0-HEAD-jre-SNAPSHOT
 export GUAVA_FAILUREACCESS_VERSION ?= 1.0.3-jpms
 export REACTIVE_STREAMS_VERSION ?= 1.0.5-SNAPSHOT
 export PROTOBUF_VERSION ?= 4.27.0-SNAPSHOT
+export GEANTYREF_VERSION ?= 1.3.16-SNAPSHOT
 else
 export CHECKER_FRAMEWORK_VERSION ?= 3.43.0-SNAPSHOT
 export GUAVA_VERSION ?= 33.0.0-jre-jpms
 export GUAVA_FAILUREACCESS_VERSION ?= 1.0.3-jpms
 export REACTIVE_STREAMS_VERSION ?= 1.0.5-jpms
 export PROTOBUF_VERSION ?= 4.26.0-jpms
+export GEANTYREF_VERSION ?= 1.3.15-jpms
 endif
 
 export PROJECT ?= $(shell pwd)
@@ -32,7 +34,7 @@ export DEV_BIN ?= $(DEV_ROOT)/bin
 export LIBS ?= $(PROJECT)/libs
 export PROJECT_PATH ?= $(DEV_BIN):$(shell echo $$PATH)
 
-DEPS ?= com.google.guava com.google.errorprone com.google.j2objc org.checkerframework org.reactivestreams com.google.protobuf
+DEPS ?= com.google.guava com.google.errorprone com.google.j2objc org.checkerframework org.reactivestreams com.google.protobuf io.leangen.geantyref
 POSIX_FLAGS ?=
 
 ifeq ($(VERBOSE),yes)
@@ -391,6 +393,31 @@ endif
 
 	@echo "Protobuf ready."
 
+#
+# Library: Checker Framework ---------------------------------------------------------------
+
+geantyref: io.leangen.geantyref  ## Build Geantyref reflection library.
+io.leangen.geantyref: $(BUILD_DEPS) io.leangen.geantyref/target
+io.leangen.geantyref/target:
+	$(info Building Geantyref...)
+	$(RULE)cd io.leangen.geantyref \
+		&& $(MAVEN) versions:set -DnewVersion=$(GEANTYREF_VERSION) \
+		&& $(MAVEN) versions:update-child-modules \
+		&& $(MAVEN) $(MAVEN_GOAL) -U
+
+ifeq ($(SNAPSHOT),no)
+	@# geantyref
+	$(RULE)$(MAVEN) deploy:deploy-file \
+		-DgroupId=io.leangen.geantyref \
+		-DartifactId=geantyref \
+		-Dversion=$(GEANTYREF_VERSION) \
+		-Dpackaging=jar \
+		-DpomFile=./tools/poms/geantyref.xml \
+		-Dfile=./io.leangen.geantyref/target/geantyref-$(GEANTYREF_VERSION).jar \
+		-DrepositoryId=jpms-local \
+		-Durl="$(REPOSITORY)"
+endif
+
 #
 # Testing: Google GSON ---------------------------------------------------------------------
 
@@ -451,10 +478,11 @@ $(LIBS):
 	$(RULE)$(CP) \
 		com.google.errorprone/annotations/target/*.jar \
 		com.google.j2objc/annotations/target/*.jar \
-		org.checkerframework/checker-qual/build/libs/*.jar \
-		org.reactivestreams/api/build/libs/*.jar \
 		com.google.guava/guava/target/*.jar \
 		com.google.protobuf/bazel-bin/java/*/amended_*_mvn-project.jar \
+		io.leangen.geantyref/target/*.jar \
+		org.checkerframework/checker-qual/build/libs/*.jar \
+		org.reactivestreams/api/build/libs/*.jar \
 		$(LIBS)
 
 prebuilts:
@@ -475,6 +503,7 @@ git-add:
 		repository/com/google/j2objc \
 		repository/com/google/errorprone \
 		repository/com/google/protobuf \
+		repository/io/leangen/geantyref \
 		repository/org/checkerframework \
 		repository/org/reactivestreams \
 		repository/dev/javamodules
@@ -491,6 +520,7 @@ clean:  ## Clean all built targets.
 		org.checkerframework/build \
 		org.checkerframework/*/build \
 		org.reactivestreams/*/build \
+		io.leangen.geantyref/target \
 		samples/gradle-platform/app/build \
 		samples/modular-guava/app/build \
 		samples/modular-guava-repo/app/build \

README.md

@@ -13,10 +13,6 @@ This repository provides sub-module library overrides for popular Java libraries
 
 Tracking issue [here][6] provides the best tracker. Once these PRs are merged and changes are released, this repo becomes obsolete.
 
-- google/j2objc#2302 feat: support jpms in annotations module
-- google/error-prone#4311 feat: add jpms definition for annotations
-- typetools/checker-framework#6326 Add module-info.java to checker-qual
-
 ### What's in the box?
 
 - **[`com.google.errorprone`][2]:** **Error Prone Compiler** "is a static analysis tool for Java that catches common programming mistakes at compile time," built by Google. Error Prone's annotations module is JPMS-enabled at the embedded sub-module, and is used by Guava. The [PR enabling JPMS support in Error Prone Annotations][3] has been filed, merged, and released, as [`2.26.1`](https://github.com/google/error-prone/releases/tag/v2.26.1).
@@ -28,6 +24,8 @@ Tracking issue [here][6] provides the best tracker. Once these PRs are merged an
 
 - **[`com.google.protobuf`][4]:** **Protocol Buffers** (a.k.a., protobuf) are Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. = JPMS support is [in draft][17].
 
+- **[`io.leangen.geantyref`][18]:** **Geantyref** is a fork of the excellent GenTyRef library, adding support for working with AnnotatedTypes introduced in Java 8 plus many nifty features.
+
 - **[`org.checkerframework`][0]:** **Checker Framework** is a type-checking framework for Java. The `checker-qual` package is used by Guava, so it is included here transitively. Checker Framework added a JPMS module definition in a [recent PR][1], so this is sub-moduled at `master`. At the time of this writing no release has taken place.
 
 - **[`org.reactivestreams`][16]:** **Reactive Streams** is a universal JVM API for building reactive software in an implementation-agnostic manner.
@@ -90,6 +88,7 @@ You should use a JPMS-enabled library version which has no conflict with Maven C
 | `com.google.protobuf:protobuf-util`             | `4.26.0-jpms`           | 🔄       |
 | `com.google.protobuf:protobuf-kotlin`           | `4.26.0-jpms`           | 🔄       |
 | `com.google.protobuf:protobuf-kotlin-lite`      | `4.26.0-jpms`           | 🔄       |
+| `io.leangen.geantyref:geantyref`                | `1.3.15-jpms`           | 🔄       |
 | `org.checkerframework:checker-qual`             | `3.43.0-SNAPSHOT`       | 🔄       |
 | `org.reactivestreams:reactive-streams`          | `1.0.5-jpms`            | ✅       |
 
@@ -107,6 +106,7 @@ Use the modules in your `module-info.java`:
 | `com.google.protobuf:protobuf-util`             | `com.google.protobuf.util`          |
 | `com.google.protobuf:protobuf-kotlin`           | `com.google.protobuf.kotlin`        |
 | `com.google.protobuf:protobuf-kotlin-lite`      | `com.google.protobuf.kotlin`        |
+| `io.leangen.geantyref:geantyref`                | `io.leangen.geantyref`              |
 | `org.checkerframework:checker-qual`             | `org.checkerframework.checker.qual` |
 | `org.reactivestreams:reactive-streams`          | `org.reactivestreams`               |
 
@@ -201,3 +201,4 @@ This repo is open source, licensed under [Apache 2.0](./LICENSE.txt). The librar
 [15]: https://docs.gradle.org/current/userguide/dependency_version_alignment.html
 [16]: https://github.com/reactive-streams/reactive-streams-jvm
 [17]: https://github.com/protocolbuffers/protobuf/pull/16178
+[18]: https://github.com/leangen/geantyref

io.leangen.geantyref

@@ -81,5 +81,10 @@
       <artifactId>reactive-streams</artifactId>
       <version>1.0.5-jpms</version>
     </dependency>
+    <dependency>
+      <groupId>io.leangen.geantyref</groupId>
+      <artifactId>geantyref</artifactId>
+      <version>1.3.15-jpms</version>
+    </dependency>
   </dependencies>
 </project>

repository/dev/javamodules/jpms-bom/1.0.0/jpms-bom-1.0.0.pom

@@ -1 +1 @@
-8c220102c5f63a54732ef11d5ff62415
+456d809dae269f97f30aa62b47bd5afb

repository/dev/javamodules/jpms-bom/1.0.0/jpms-bom-1.0.0.pom.md5

@@ -1 +1 @@
-f5de31902ee89054f58a403d72415da49c1bfbf7
+1489c86ff9b71216b52216c29506cd886fce23af

repository/dev/javamodules/jpms-bom/1.0.0/jpms-bom-1.0.0.pom.sha1

@@ -7,6 +7,6 @@
     <versions>
       <version>1.0.0</version>
     </versions>
-    <lastUpdated>20240315032701</lastUpdated>
+    <lastUpdated>20240316002757</lastUpdated>
   </versioning>
 </metadata>

repository/dev/javamodules/jpms-bom/maven-metadata.xml

@@ -1 +1 @@
-ccf62ac077348f68ff63f02474563db4
+98af946caf493cafbfc67c6116030d2d

repository/dev/javamodules/jpms-bom/maven-metadata.xml.md5

@@ -1 +1 @@
-b0c670b72e9c5dc87d3f48fbcfd4cf5b22d2686e
+a15b404af68e2a7b71b07b7a8afb136800064713