Skip to content

Commit 9851171

Browse files
authored
[Upgrade 2023/09] Vert.x 4.4.5 + AWS SDK 2.20.138. Fixes #65 #67 #68 (#66)
Upgrades 2023-09: fixes #65 and improves CI (fixes #67 #68 )
1 parent 883755f commit 9851171

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

.github/workflows/ci-release.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Get Project version
2626
id: get_version
27-
run: echo ::set-output name=VERSION::$(gradle properties --no-daemon --console=plain -q | grep "^version:" | awk '{printf $2}')
27+
run: echo VERSION=$(gradle properties --no-daemon --console=plain -q | grep "^version:" | awk '{printf $2}') >> "$GITHUB_OUTPUT"
2828

2929
- name: Decode
3030
run: |
@@ -38,12 +38,11 @@ jobs:
3838
arguments: assemble publish -Psigning.keyId=${{secrets.SIGNING_KEY_ID}} -Psigning.password=${{secrets.SIGNING_PASSWORD}} -Psigning.secretKeyRingFile=/tmp/secring.gpg -PossrhUsername=${{secrets.SONATYPE_NEXUS_USERNAME}} -PossrhPassword=${{secrets.SONATYPE_NEXUS_PASSWORD}} --stacktrace
3939

4040
- name: Create Release in Github
41-
uses: actions/create-release@latest
42-
env:
43-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
41+
uses: softprops/action-gh-release@v1
4442
with:
4543
tag_name: ${{ steps.get_version.outputs.VERSION }}
46-
release_name: ${{ steps.get_version.outputs.VERSION }}
44+
name: ${{ steps.get_version.outputs.VERSION }}
45+
generate_release_notes: true
4746
body: |
4847
Available in Sonatype repository under:
4948
[`io.reactiverse:aws-sdk:${{ steps.get_version.outputs.VERSION }}`](https://central.sonatype.com/artifact/io.reactiverse/aws-sdk/${{ steps.get_version.outputs.VERSION }})

.github/workflows/ci-snapshot.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Get Project version
2525
id: get_version
26-
run: echo ::set-output name=VERSION::$(gradle properties --no-daemon --console=plain -q | grep "^version:" | awk '{printf $2}')
26+
run: echo VERSION=$(gradle properties --no-daemon --console=plain -q | grep "^version:" | awk '{printf $2}') >> "$GITHUB_OUTPUT"
2727

2828
- name: Decode
2929
run: |
@@ -37,12 +37,11 @@ jobs:
3737
arguments: assemble publish -Psigning.keyId=${{secrets.SIGNING_KEY_ID}} -Psigning.password=${{secrets.SIGNING_PASSWORD}} -Psigning.secretKeyRingFile=/tmp/secring.gpg -PossrhUsername=${{secrets.SONATYPE_NEXUS_USERNAME}} -PossrhPassword=${{secrets.SONATYPE_NEXUS_PASSWORD}} --stacktrace
3838

3939
- name: Create Release in Github
40-
uses: actions/create-release@latest
41-
env:
42-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
40+
uses: softprops/action-gh-release@v1
4341
with:
4442
tag_name: ${{ steps.get_version.outputs.VERSION }}
45-
release_name: ${{ steps.get_version.outputs.VERSION }}
43+
name: ${{ steps.get_version.outputs.VERSION }}
44+
generate_release_notes: true
4645
body: |
4746
Available in Sonatype SNAPSHOTs repository under:
4847
`io.reactiverse:aws-sdk:${{ steps.get_version.outputs.VERSION }}`

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Artifacts are published [here](https://search.maven.org/artifact/io.reactiverse/
1212

1313
| Project | Vert.x | AWS sdk |
1414
|---------|--------|----------|
15+
| 1.2.2 | 4.4.5 | 2.20.138 |
1516
| 1.2.1 | 4.4.2 | 2.20.74 |
1617
| 1.2.0 | 4.4.0 | 2.20.2 |
1718
| 1.1.0 | 4.2.4 | 2.17.129 |

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
val vertxVersion = "4.4.2"
2-
val awsSdkVersion = "2.20.74"
1+
val vertxVersion = "4.4.5"
2+
val awsSdkVersion = "2.20.138"
33
val junit5Version = "5.8.2"
44
val logbackVersion = "1.2.10"
55
val localstackVersion = "0.2.22"
66
val integrationOption = "tests.integration"
77

88
group = "io.reactiverse"
9-
version = "1.2.1"
9+
version = "1.2.2-SNAPSHOT"
1010

1111
plugins {
1212
`java-library`
@@ -37,7 +37,7 @@ repositories {
3737
}
3838

3939
fun isNonStable(version: String): Boolean {
40-
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
40+
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
4141
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
4242
val isStable = stableKeyword || regex.matches(version)
4343
return isStable.not()

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.gradle.jvmargs=-Xmx4096m

src/main/java/io/reactiverse/awssdk/reactivestreams/WriteStreamSubscriber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void onSubscribe(Subscription subscription) {
3636

3737
@Override
3838
public void onNext(ByteBuffer byteBuffer) {
39-
if (byteBuffer.array().length != 0) {
39+
if (byteBuffer.hasRemaining()) {
4040
Buffer buffer = Buffer.buffer(Unpooled.wrappedBuffer(byteBuffer));
4141
stream.write(buffer);
4242
}

0 commit comments

Comments
 (0)