Skip to content

Commit 6344d5e

Browse files
mostroverkhovmostroverkhov
committed
Merge branch 'release/1.5.0'
2 parents f79c364 + febeb7f commit 6344d5e

File tree

34 files changed

+693
-75
lines changed

34 files changed

+693
-75
lines changed

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Project supports 3 kinds of APIs:
4646
**GRPC compatible**. All implementations are directly compatible with GRPC via MessageStreams-RPC & GRPC transport.
4747
GRPC clients can access such services without separate "gateway" binaries and IDL sharing schemes.
4848

49-
**Non-intrusive**. [MessageStreams](https://github.com/jauntsdn/rsocket-jvm/blob/1.3.2/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/MessageStreams.java) API & [RSocket-JVM](https://github.com/jauntsdn/rsocket-jvm/blob/1.3.2/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/RSocket.java) runtime are clearly split so from end-user perspective there is
49+
**Non-intrusive**. [MessageStreams](https://github.com/jauntsdn/rsocket-jvm/blob/1.4.0/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/MessageStreams.java) API & [RSocket-JVM](https://github.com/jauntsdn/rsocket-jvm/blob/1.4.0/rsocket-reactor/src/main/java/com/jauntsdn/rsocket/RSocket.java) runtime are clearly split so from end-user perspective there is
5050
only set of streaming & non-streaming interactions on buffers/messages:
5151

5252
```groovy
@@ -116,10 +116,10 @@ repositories {
116116
}
117117
118118
dependencies {
119-
implementation "com.jauntsdn.rsocket:rsocket-messages:1.3.2"
120-
implementation "com.jauntsdn.rsocket:rsocket-rpc-idl:1.3.2"
121-
implementation "com.jauntsdn.rsocket:rsocket-<VENDOR>:1.3.2"
122-
implementation "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>:1.3.2"
119+
implementation "com.jauntsdn.rsocket:rsocket-messages:1.4.0"
120+
implementation "com.jauntsdn.rsocket:rsocket-rpc-idl:1.4.0"
121+
implementation "com.jauntsdn.rsocket:rsocket-<VENDOR>:1.4.0"
122+
implementation "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>:1.4.0"
123123
}
124124
```
125125

@@ -128,7 +128,7 @@ MessageStreams-RPC compiler binaries are linux, windows(x86) only
128128
protobuf {
129129
plugins {
130130
rsocketRpc {
131-
artifact = "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>-compiler:1.3.2"
131+
artifact = "com.jauntsdn.rsocket:rsocket-rpc-<VENDOR>-compiler:1.4.0"
132132
}
133133
}
134134
}

‎build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ subprojects {
3232
mavenCentral()
3333
}
3434

35+
def name = project.name
3536
def javaVersion =
36-
project.name.endsWith("virtualthreads") ? 20
37-
: project.name.endsWith("helidon") ? 11
37+
name.endsWith("virtualthreads") ? 20
38+
: name.endsWith("helidon") || name.endsWith("mutiny") ? 11
3839
: 8
3940

4041
plugins.withType(JavaLibraryPlugin) {

‎gradle.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
group=com.jauntsdn.rsocket
2-
version=1.4.0
2+
version=1.5.0
33

44
dependencyManagementPluginVersion=1.1.0
55
protobufPluginVersion=0.9.2
66
googleJavaFormatPluginVersion=0.9
77
gitPluginVersion=0.13.0
88
versionsPluginVersion=0.45.0
99

10-
nettyBomVersion=4.1.92.Final
11-
grpcStubVersion=1.54.1
12-
reactorBomVersion=Dysprosium-SR22
10+
nettyBomVersion=4.1.96.Final
11+
grpcStubVersion=1.57.1
12+
reactorBomVersion=2022.0.9
1313
rxjavaVersion=3.1.6
1414
helidonCommonReactiveVersion=2.5.6
15-
mutinyVersion=1.8.0
15+
mutinyVersion=2.3.1
1616
jsr305Version=3.0.2
1717
javaxInjectVersion=1
1818
javaxAnnotationVersion=1.3.2
1919
jakartaInjectVersion=2.0.1
2020
jakartaAnnotationVersion=2.1.1
2121

22-
protobufVersion=3.22.3
22+
protobufVersion=3.23.4
2323

2424
release=false
2525
virtualthreads=false

‎gradle/publishing.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ subprojects {
3838
}
3939
}
4040
scm {
41-
connection = "scm:git:https://github.com/jauntsdn/rsocket.git"
42-
developerConnection = "scm:git:https://github.com/jauntsdn/rsocket.git"
43-
url = "https://github.com/jauntsdn/rsocket"
41+
connection = "scm:git:https://github.com/jauntsdn/rsocket-jvm.git"
42+
developerConnection = "scm:git:https://github.com/jauntsdn/rsocket-jvm.git"
43+
url = "https://github.com/jauntsdn/rsocket-jvm"
4444
}
4545
versionMapping {
4646
usage("java-api") {

‎rsocket-bom/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
io.netty:netty-bom:4.1.92.Final=classpath
5-
io.projectreactor:reactor-bom:Dysprosium-SR22=classpath
4+
io.netty:netty-bom:4.1.96.Final=classpath
5+
io.projectreactor:reactor-bom:2022.0.9=classpath
66
empty=

‎rsocket-futures/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
77
com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
88
com.google.guava:guava:22.0=googleJavaFormat1.6
99
com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
10-
io.netty:netty-buffer:4.1.92.Final=compileClasspath,runtimeClasspath
11-
io.netty:netty-common:4.1.92.Final=compileClasspath,runtimeClasspath
10+
io.netty:netty-buffer:4.1.96.Final=compileClasspath,runtimeClasspath
11+
io.netty:netty-common:4.1.96.Final=compileClasspath,runtimeClasspath
1212
org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
1313
empty=annotationProcessor

‎rsocket-grpc/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
77
com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
88
com.google.guava:guava:22.0=googleJavaFormat1.6
99
com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
10-
io.grpc:grpc-stub:1.54.1=compileClasspath,runtimeClasspath
11-
io.netty:netty-buffer:4.1.92.Final=compileClasspath,runtimeClasspath
12-
io.netty:netty-common:4.1.92.Final=compileClasspath,runtimeClasspath
10+
io.grpc:grpc-stub:1.57.1=compileClasspath,runtimeClasspath
11+
io.netty:netty-buffer:4.1.96.Final=compileClasspath,runtimeClasspath
12+
io.netty:netty-common:4.1.96.Final=compileClasspath,runtimeClasspath
1313
org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
1414
empty=annotationProcessor

‎rsocket-helidon/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ io.helidon.common:helidon-common-mapper:2.5.6=compileClasspath,runtimeClasspath
1111
io.helidon.common:helidon-common-reactive:2.5.6=compileClasspath,runtimeClasspath
1212
io.helidon.common:helidon-common-service-loader:2.5.6=compileClasspath,runtimeClasspath
1313
io.helidon.common:helidon-common:2.5.6=compileClasspath,runtimeClasspath
14-
io.netty:netty-buffer:4.1.92.Final=compileClasspath,runtimeClasspath
15-
io.netty:netty-common:4.1.92.Final=compileClasspath,runtimeClasspath
14+
io.netty:netty-buffer:4.1.96.Final=compileClasspath,runtimeClasspath
15+
io.netty:netty-common:4.1.96.Final=compileClasspath,runtimeClasspath
1616
jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath
1717
org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
1818
empty=annotationProcessor

‎rsocket-messages/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
77
com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
88
com.google.guava:guava:22.0=googleJavaFormat1.6
99
com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
10-
io.netty:netty-buffer:4.1.92.Final=compileClasspath,runtimeClasspath
11-
io.netty:netty-common:4.1.92.Final=compileClasspath,runtimeClasspath
10+
io.netty:netty-buffer:4.1.96.Final=compileClasspath,runtimeClasspath
11+
io.netty:netty-common:4.1.96.Final=compileClasspath,runtimeClasspath
1212
org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
1313
empty=annotationProcessor

0 commit comments

Comments
 (0)