Skip to content

Commit 645ef02

Browse files
authored
feat: add org.reactivestreams (#9)
- chore: add `org.reactivestreams` submodule - chore: pin to reactive-streams/reactive-streams-jvm#556 - chore: sync repository - chore: add to version catalog Relates-To: #1 Signed-off-by: Sam Gammon <[email protected]>
1 parent e21ef7f commit 645ef02

File tree

83 files changed

+675
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+675
-6
lines changed

Diff for: .gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@
1313
[submodule "guava"]
1414
path = com.google.guava
1515
url = [email protected]:sgammon/guava.git
16+
[submodule "reactive-streams"]
17+
path = org.reactivestreams
18+
url = [email protected]:sgammon/reactive-streams-jvm.git

Diff for: Makefile

+19-1
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,18 @@ ifeq ($(SNAPSHOT),yes)
1616
export CHECKER_FRAMEWORK_VERSION ?= 3.43.0-SNAPSHOT
1717
export GUAVA_VERSION ?= 1.0-HEAD-jre-SNAPSHOT
1818
export GUAVA_FAILUREACCESS_VERSION ?= 1.0.3-jpms
19+
export REACTIVE_STREAMS_VERSION ?= 1.0.5-SNAPSHOT
1920
else
2021
export CHECKER_FRAMEWORK_VERSION ?= 3.43.0-SNAPSHOT
2122
export GUAVA_VERSION ?= 33.0.0-jre-jpms
2223
export GUAVA_FAILUREACCESS_VERSION ?= 1.0.3-jpms
24+
export REACTIVE_STREAMS_VERSION ?= 1.0.5-jpms
2325
endif
2426

2527
export PROJECT ?= $(shell pwd)
2628
export LIBS ?= $(PROJECT)/libs
2729

28-
DEPS ?= com.google.guava com.google.errorprone com.google.j2objc org.checkerframework
30+
DEPS ?= com.google.guava com.google.errorprone com.google.j2objc org.checkerframework org.reactivestreams
2931
POSIX_FLAGS ?=
3032

3133
ifeq ($(VERBOSE),yes)
@@ -140,6 +142,19 @@ com.google.guava/guava/futures/failureaccess/target:
140142
&& $(GIT) checkout . \
141143
&& echo "Guava Failure Access ready."
142144

145+
reactivestreams: org.reactivestreams ## Build Reactive Streams.
146+
org.reactivestreams: org.reactivestreams/api/build/libs
147+
org.reactivestreams/api/build/libs:
148+
$(info Building Reactive Streams...)
149+
$(RULE)cd org.reactivestreams \
150+
&& $(GRADLE) \
151+
-Pversion=$(REACTIVE_STREAMS_VERSION) \
152+
-PreleaseVersion=$(REACTIVE_STREAMS_VERSION) \
153+
$(GRADLE_GOAL) \
154+
publishToMavenLocal \
155+
publishAllPublicationsToMavenLocalRepository \
156+
&& echo "Reactive Streams ready."
157+
143158
#
144159
# Top-level commands
145160
#
@@ -171,6 +186,7 @@ $(LIBS):
171186
com.google.errorprone/annotations/target/*.jar \
172187
com.google.j2objc/annotations/target/*.jar \
173188
org.checkerframework/checker-qual/build/libs/*.jar \
189+
org.reactivestreams/api/build/libs/*.jar \
174190
com.google.guava/guava/target/*.jar \
175191
$(LIBS)
176192

@@ -192,6 +208,7 @@ git-add:
192208
repository/com/google/j2objc \
193209
repository/com/google/errorprone \
194210
repository/org/checkerframework \
211+
repository/org/reactivestreams \
195212
repository/dev/javamodules
196213
$(GIT) status -sb
197214

@@ -205,6 +222,7 @@ clean: ## Clean all built targets.
205222
com.google.guava/futures/failureaccess/target \
206223
org.checkerframework/build \
207224
org.checkerframework/*/build \
225+
org.reactivestreams/*/build \
208226
samples/gradle-platform/app/build \
209227
samples/modular-guava/app/build \
210228
samples/modular-guava-repo/app/build \

Diff for: README.md

+16
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Tracking issue [here][6] provides the best tracker. Once these PRs are merged an
2727

2828
- **[`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.
2929

30+
- **[`org.reactivestreams`][16]:** **Reactive Streams** is a universal JVM API for building reactive software in an implementation-agnostic manner.
31+
3032
### How do I use it?
3133

3234
Add this domain as a repository within any JVM build tool: [Maven][7], [Gradle][8], [Bazel][9], [sbt][10]. For example:
@@ -81,6 +83,19 @@ You should use a JPMS-enabled library version which has no conflict with Maven C
8183
| `com.google.guava:guava` | `33.0.0-jre-jpms` | 🔄 |
8284
| `com.google.j2objc:j2objc-annotations` | `3.0.0` ||
8385
| `org.checkerframework:checker-qual` | `3.43.0-SNAPSHOT` | 🔄 |
86+
| `org.reactivestreams:reactive-streams` | `1.0.5-jpms` ||
87+
88+
### Using the modules
89+
90+
Use the modules in your `module-info.java`:
91+
92+
| Coordinate | Module |
93+
| ----------------------------------------------- | ----------------------------------- |
94+
| `com.google.errorprone:error_prone_annotations` | `com.google.errorprone.annotations` |
95+
| `com.google.guava:guava` | `com.google.common` |
96+
| `com.google.j2objc:j2objc-annotations` | `com.google.j2objc.annotations` |
97+
| `org.checkerframework:checker-qual` | `org.checkerframework.checker.qual` |
98+
| `org.reactivestreams:reactive-streams` | `org.reactivestreams` |
8499

85100
### BOMs & Catalogs
86101

@@ -171,3 +186,4 @@ This repo is open source, licensed under [Apache 2.0](./LICENSE.txt). The librar
171186
[13]: https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#bill-of-materials-bom-poms
172187
[14]: https://docs.gradle.org/current/userguide/platforms.html
173188
[15]: https://docs.gradle.org/current/userguide/dependency_version_alignment.html
189+
[16]: https://github.com/reactive-streams/reactive-streams-jvm

Diff for: org.reactivestreams

Submodule org.reactivestreams added at a973c9e
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<metadata modelVersion="1.1.0">
3+
<groupId>org.reactivestreams</groupId>
4+
<artifactId>reactive-streams</artifactId>
5+
<versioning>
6+
<lastUpdated>20240313040850</lastUpdated>
7+
<snapshot>
8+
<localCopy>true</localCopy>
9+
</snapshot>
10+
<snapshotVersions>
11+
<snapshotVersion>
12+
<extension>jar</extension>
13+
<value>1.0.5-SNAPSHOT</value>
14+
<updated>20240313040850</updated>
15+
</snapshotVersion>
16+
<snapshotVersion>
17+
<extension>pom</extension>
18+
<value>1.0.5-SNAPSHOT</value>
19+
<updated>20240313040850</updated>
20+
</snapshotVersion>
21+
<snapshotVersion>
22+
<extension>module</extension>
23+
<value>1.0.5-SNAPSHOT</value>
24+
<updated>20240313040850</updated>
25+
</snapshotVersion>
26+
</snapshotVersions>
27+
</versioning>
28+
<version>1.0.5-SNAPSHOT</version>
29+
</metadata>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<metadata modelVersion="1.1.0">
3+
<groupId>org.reactivestreams</groupId>
4+
<artifactId>reactive-streams</artifactId>
5+
<versioning>
6+
<lastUpdated>20240313040846</lastUpdated>
7+
<snapshot>
8+
<timestamp>20240313.040846</timestamp>
9+
<buildNumber>3</buildNumber>
10+
</snapshot>
11+
<snapshotVersions>
12+
<snapshotVersion>
13+
<extension>jar</extension>
14+
<value>1.0.5-20240313.040846-3</value>
15+
<updated>20240313040846</updated>
16+
</snapshotVersion>
17+
<snapshotVersion>
18+
<extension>pom</extension>
19+
<value>1.0.5-20240313.040846-3</value>
20+
<updated>20240313040846</updated>
21+
</snapshotVersion>
22+
<snapshotVersion>
23+
<extension>module</extension>
24+
<value>1.0.5-20240313.040846-3</value>
25+
<updated>20240313040846</updated>
26+
</snapshotVersion>
27+
</snapshotVersions>
28+
</versioning>
29+
<version>1.0.5-SNAPSHOT</version>
30+
</metadata>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2f02be4e952bf9088283830ddf9f5343
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a6ad042fb0c58ee74726856142a274c2795e418f
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
80ac42244391ba2500bf9b834ea0a0f5e3772baff79cc62c0de26f99cb85b8f8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a0599893bc9711329ac77c5aa07bbcb93b1740946028d1f5a87050371b4b63444839cbcff937f454f3906c48b8e40b2c3e191ce24e816546b71c615dd60717d0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eb641960bd02ea4eda635f35dfcccae2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
68e379ba80b7063583c75723d1a3fb315ae00cad
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7c2270378b0379634a9573f143786fd60de59617e115e622d74191d18f468af7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4f419014e00d00a4feb9495c2aa1048460f977be94fcc96dfaee88baea7152c2fbf710e1d90e49f641f667f0a8b01e5c2dc4df507f8218866d232bfb1cbb5a27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"formatVersion": "1.1",
3+
"component": {
4+
"group": "org.reactivestreams",
5+
"module": "reactive-streams",
6+
"version": "1.0.5-SNAPSHOT",
7+
"attributes": {
8+
"org.gradle.status": "integration"
9+
}
10+
},
11+
"createdBy": {
12+
"gradle": {
13+
"version": "8.6"
14+
}
15+
},
16+
"variants": [
17+
{
18+
"name": "apiElements",
19+
"attributes": {
20+
"org.gradle.category": "library",
21+
"org.gradle.dependency.bundling": "external",
22+
"org.gradle.jvm.version": 6,
23+
"org.gradle.libraryelements": "jar",
24+
"org.gradle.usage": "java-api"
25+
},
26+
"files": [
27+
{
28+
"name": "reactive-streams-1.0.5-SNAPSHOT.jar",
29+
"url": "reactive-streams-1.0.5-SNAPSHOT.jar",
30+
"size": 13518,
31+
"sha512": "4f419014e00d00a4feb9495c2aa1048460f977be94fcc96dfaee88baea7152c2fbf710e1d90e49f641f667f0a8b01e5c2dc4df507f8218866d232bfb1cbb5a27",
32+
"sha256": "7c2270378b0379634a9573f143786fd60de59617e115e622d74191d18f468af7",
33+
"sha1": "68e379ba80b7063583c75723d1a3fb315ae00cad",
34+
"md5": "eb641960bd02ea4eda635f35dfcccae2"
35+
}
36+
]
37+
},
38+
{
39+
"name": "runtimeElements",
40+
"attributes": {
41+
"org.gradle.category": "library",
42+
"org.gradle.dependency.bundling": "external",
43+
"org.gradle.jvm.version": 6,
44+
"org.gradle.libraryelements": "jar",
45+
"org.gradle.usage": "java-runtime"
46+
},
47+
"files": [
48+
{
49+
"name": "reactive-streams-1.0.5-SNAPSHOT.jar",
50+
"url": "reactive-streams-1.0.5-SNAPSHOT.jar",
51+
"size": 13518,
52+
"sha512": "4f419014e00d00a4feb9495c2aa1048460f977be94fcc96dfaee88baea7152c2fbf710e1d90e49f641f667f0a8b01e5c2dc4df507f8218866d232bfb1cbb5a27",
53+
"sha256": "7c2270378b0379634a9573f143786fd60de59617e115e622d74191d18f468af7",
54+
"sha1": "68e379ba80b7063583c75723d1a3fb315ae00cad",
55+
"md5": "eb641960bd02ea4eda635f35dfcccae2"
56+
}
57+
]
58+
}
59+
]
60+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c5b29b6c917d527b3a5c80fee0e1847b
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eb9894e730cf3d82eb7efe3b3d828ca50801e3ad
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cb8017fdfe8cfb7e9c4850f4b2c35fbb87e227cd929a77deb68136b3e3eb6eca
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
be265c9f29faef5e31f061da016b4684daba2e8eabf115c76dd77762422a574e5895437ec22669ad071eefb01a209d896e51e818820ff8dd5d37a9b3dce8ddc5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<!-- This module was also published with a richer model, Gradle metadata, -->
5+
<!-- which should be used instead. Do not delete the following line which -->
6+
<!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
7+
<!-- that they should prefer consuming it instead. -->
8+
<!-- do_not_remove: published-with-gradle-metadata -->
9+
<modelVersion>4.0.0</modelVersion>
10+
<groupId>org.reactivestreams</groupId>
11+
<artifactId>reactive-streams</artifactId>
12+
<version>1.0.5-SNAPSHOT</version>
13+
<name>reactive-streams</name>
14+
<description>A Protocol for Asynchronous Non-Blocking Data Sequence</description>
15+
<url>https://www.reactive-streams.org/</url>
16+
<inceptionYear>2014</inceptionYear>
17+
<licenses>
18+
<license>
19+
<name>MIT-0</name>
20+
<url>https://spdx.org/licenses/MIT-0.html</url>
21+
<distribution>repo</distribution>
22+
</license>
23+
</licenses>
24+
<developers>
25+
<developer>
26+
<id>reactive-streams-sig</id>
27+
<name>Reactive Streams SIG</name>
28+
<url>https://www.reactive-streams.org/</url>
29+
</developer>
30+
</developers>
31+
<scm>
32+
<connection>scm:git:[email protected]:reactive-streams/reactive-streams.git</connection>
33+
<url>[email protected]:reactive-streams/reactive-streams.git</url>
34+
</scm>
35+
</project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e1919c5284601c3f39526261641b539b
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
701e1d713e8f6ff75410d7e921c77c9fa2ce5034
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2b1623f0786ae51c62135d57be49deab6ecaf0e69a9d8bf9f285abf4e7f429a1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b32a7b000fa60baa192f5f31e36564d69eca902f36f370a05509515d1c172cc88107d39311a52eebae21829258c0d30d42f8176a48eda4ff90e6d58cdd7dfea0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
61eeae3776f8ea394267e1d071664f7d
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7e1a1f143e21e86e71d07c48790666fc4ca5bf42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5c03527f2b2f58fb5a54b06a818ed47144c5e2461e41fca0725a38f85c9d1280
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ce46f0a596e6c5a944782ca3328e262b703f22ecc78c4258de96a7160ea894b9f09e31a46ee8c3d10101dbc42432c5f5989a3b75a83b8e2b2f27a8d0acc96091
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"formatVersion": "1.1",
3+
"component": {
4+
"group": "org.reactivestreams",
5+
"module": "reactive-streams",
6+
"version": "1.0.5-SNAPSHOT",
7+
"attributes": {
8+
"org.gradle.status": "integration"
9+
}
10+
},
11+
"createdBy": {
12+
"gradle": {
13+
"version": "8.6"
14+
}
15+
},
16+
"variants": [
17+
{
18+
"name": "apiElements",
19+
"attributes": {
20+
"org.gradle.category": "library",
21+
"org.gradle.dependency.bundling": "external",
22+
"org.gradle.jvm.version": 6,
23+
"org.gradle.libraryelements": "jar",
24+
"org.gradle.usage": "java-api"
25+
},
26+
"files": [
27+
{
28+
"name": "reactive-streams-1.0.5-SNAPSHOT.jar",
29+
"url": "reactive-streams-1.0.5-SNAPSHOT.jar",
30+
"size": 13517,
31+
"sha512": "ce46f0a596e6c5a944782ca3328e262b703f22ecc78c4258de96a7160ea894b9f09e31a46ee8c3d10101dbc42432c5f5989a3b75a83b8e2b2f27a8d0acc96091",
32+
"sha256": "5c03527f2b2f58fb5a54b06a818ed47144c5e2461e41fca0725a38f85c9d1280",
33+
"sha1": "7e1a1f143e21e86e71d07c48790666fc4ca5bf42",
34+
"md5": "61eeae3776f8ea394267e1d071664f7d"
35+
}
36+
]
37+
},
38+
{
39+
"name": "runtimeElements",
40+
"attributes": {
41+
"org.gradle.category": "library",
42+
"org.gradle.dependency.bundling": "external",
43+
"org.gradle.jvm.version": 6,
44+
"org.gradle.libraryelements": "jar",
45+
"org.gradle.usage": "java-runtime"
46+
},
47+
"files": [
48+
{
49+
"name": "reactive-streams-1.0.5-SNAPSHOT.jar",
50+
"url": "reactive-streams-1.0.5-SNAPSHOT.jar",
51+
"size": 13517,
52+
"sha512": "ce46f0a596e6c5a944782ca3328e262b703f22ecc78c4258de96a7160ea894b9f09e31a46ee8c3d10101dbc42432c5f5989a3b75a83b8e2b2f27a8d0acc96091",
53+
"sha256": "5c03527f2b2f58fb5a54b06a818ed47144c5e2461e41fca0725a38f85c9d1280",
54+
"sha1": "7e1a1f143e21e86e71d07c48790666fc4ca5bf42",
55+
"md5": "61eeae3776f8ea394267e1d071664f7d"
56+
}
57+
]
58+
}
59+
]
60+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e9bb0e3887e5945fad1c893557acfb13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3079469316da49aee94d8d16f2a04add0200e434
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7430493901e1aeeaa976eac47d8f6460d5d848b2fc6d56dabf046e7a97a54481
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3737525bf1c17ffb71804b27d4c930cf6626c08ec4238a28aaf0bb0917992e313d75f07a909289c7cae344aa8aba31c60608c6207b9b305e161ba6a70b3d59b5

0 commit comments

Comments
 (0)