Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Upgrade 2023/09] Vert.x 4.4.5 + AWS SDK 2.20.138. Fixes #65 #67 #68 #66

Merged
merged 6 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

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

- name: Decode
run: |
Expand All @@ -38,12 +38,11 @@ jobs:
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

- name: Create Release in Github
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ steps.get_version.outputs.VERSION }}
release_name: ${{ steps.get_version.outputs.VERSION }}
name: ${{ steps.get_version.outputs.VERSION }}
generate_release_notes: true
body: |
Available in Sonatype repository under:
[`io.reactiverse:aws-sdk:${{ steps.get_version.outputs.VERSION }}`](https://central.sonatype.com/artifact/io.reactiverse/aws-sdk/${{ steps.get_version.outputs.VERSION }})
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/ci-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

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

- name: Decode
run: |
Expand All @@ -37,12 +37,11 @@ jobs:
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

- name: Create Release in Github
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ steps.get_version.outputs.VERSION }}
release_name: ${{ steps.get_version.outputs.VERSION }}
name: ${{ steps.get_version.outputs.VERSION }}
generate_release_notes: true
body: |
Available in Sonatype SNAPSHOTs repository under:
`io.reactiverse:aws-sdk:${{ steps.get_version.outputs.VERSION }}`
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Artifacts are published [here](https://search.maven.org/artifact/io.reactiverse/

| Project | Vert.x | AWS sdk |
|---------|--------|----------|
| 1.2.2 | 4.4.5 | 2.20.138 |
| 1.2.1 | 4.4.2 | 2.20.74 |
| 1.2.0 | 4.4.0 | 2.20.2 |
| 1.1.0 | 4.2.4 | 2.17.129 |
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
val vertxVersion = "4.4.2"
val awsSdkVersion = "2.20.74"
val vertxVersion = "4.4.5"
val awsSdkVersion = "2.20.138"
val junit5Version = "5.8.2"
val logbackVersion = "1.2.10"
val localstackVersion = "0.2.22"
val integrationOption = "tests.integration"

group = "io.reactiverse"
version = "1.2.1"
version = "1.2.2-SNAPSHOT"

plugins {
`java-library`
Expand Down Expand Up @@ -37,7 +37,7 @@ repositories {
}

fun isNonStable(version: String): Boolean {
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
val isStable = stableKeyword || regex.matches(version)
return isStable.not()
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.gradle.jvmargs=-Xmx4096m
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void onSubscribe(Subscription subscription) {

@Override
public void onNext(ByteBuffer byteBuffer) {
if (byteBuffer.array().length != 0) {
if (byteBuffer.hasRemaining()) {
Buffer buffer = Buffer.buffer(Unpooled.wrappedBuffer(byteBuffer));
stream.write(buffer);
}
Expand Down