feat/2022-upgrades-1

.github/workflows/ci-release.yml

@@ -3,37 +3,43 @@ name: CI-Release
 on:
   push:
     tags:
-      - RELEASE-*
+      - '*-RELEASE'
 
 jobs:
-  publish-release-bintray:
+  publish-release-sonatype:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d '-' -f 2)
-      - uses: actions/setup-java@v1
+
+      - name: Setup java
+        uses: actions/setup-java@v1
         with:
           java-version: 11
-      - name: Release to Bintray
-        uses: eskatos/gradle-command-action@v1
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 6.5
-          arguments: test bintrayUpload
-        env:
-          BINTRAY_USER: ${{secrets.BINTRAY_USER}}
-          BINTRAY_KEY: ${{secrets.BINTRAY_KEY}}
-      - name: Creates a Release in Github
+          gradle-version: 7.4
+
+      - 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}')
+
+      - name: Publish Release to Sonatype
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.4
+          arguments: assemble publish -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
         with:
           tag_name: ${{ steps.get_version.outputs.VERSION }}
           release_name: ${{ steps.get_version.outputs.VERSION }}
           body: |
-            Available in Bintray/Sonatype repositories under:
+            Available in Sonatype SNAPSHOTs repository under:
             `io.reactiverse:aws-sdk:${{ steps.get_version.outputs.VERSION }}`
           draft: false
           prerelease: false
-

.github/workflows/ci-snapshot.yml

@@ -2,32 +2,43 @@ name: CI-Snapshot
 on:
   push:
     tags:
-      - SNAPSHOT-*
+      - '*-SNAPSHOT'
 
 jobs:
   publish-snapshot-sonatype:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d '-' -f 2)
-      - uses: actions/setup-java@v1
+
+      - name: Setup java
+        uses: actions/setup-java@v1
         with:
           java-version: 11
-      - uses: eskatos/gradle-command-action@v1
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.4
+
+      - 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}')
+
+      - name: Publish Release to Sonatype
+        uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 6.5
-          arguments: assemble publish -PossrhUsername=${{secrets.SONATYPE_NEXUS_USERNAME}} -PossrhPassword=${{secrets.SONATYPE_NEXUS_PASSWORD}}
-      - name: Create Snapshot Release in Github
+          gradle-version: 7.4
+          arguments: assemble publish -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
         with:
-          tag_name: ${{ steps.get_version.outputs.VERSION }}-SNAPSHOT
-          release_name: ${{ steps.get_version.outputs.VERSION }}-SNAPSHOT
+          tag_name: ${{ steps.get_version.outputs.VERSION }}
+          release_name: ${{ steps.get_version.outputs.VERSION }}
           body: |
             Available in Sonatype SNAPSHOTs repository under:
-            `io.reactiverse:aws-sdk:${{ steps.get_version.outputs.VERSION }}-SNAPSHOT`
+            `io.reactiverse:aws-sdk:${{ steps.get_version.outputs.VERSION }}`
           draft: true
           prerelease: true

.github/workflows/ci-test.yml

@@ -7,16 +7,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11 ]
+        java: [ 8, 11, 17 ]
     name: "Run tests with JDK ${{ matrix.java }}"
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
+
       - name: Pre-Pull localstack image
-        run: "docker pull localstack/localstack:0.10.2"
-      - uses: eskatos/gradle-command-action@v1
+        run: "docker pull localstack/localstack:0.14"
+
+
+      - uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 6.5
+          gradle-version: 7.4
           arguments: test -Dtests.integration=localstack

README.md

@@ -10,15 +10,16 @@ Artifacts are published [here](https://search.maven.org/artifact/io.reactiverse/
 
 ## Version compatibility matrix
 
-| Project | Vert.x | AWS sdk |
-| ------- | ------ | ------- |
-|  1.0.0  | 4.0.0  | 2.15.45 |
-|  0.7.0  | 3.9.4  | 2.15.23 |
-|  0.6.0  | 3.9.2  | 2.14.7  |
-|  0.5.1  | 3.9.2  | 2.13.6  |
-|  0.5.0  | 3.9.0  | 2.12.0  |
-|  0.4.0  | 3.8.3  | 2.10.16 |
-|  0.3.0  | 3.8.1  | 2.7.8   |
+| Project | Vert.x | AWS sdk  |
+|---------|--------|----------|
+| 1.1.0   | 4.2.5  | 2.17.129 |
+| 1.0.0   | 4.0.0  | 2.15.45  |
+| 0.7.0   | 3.9.4  | 2.15.23  |
+| 0.6.0   | 3.9.2  | 2.14.7   |
+| 0.5.1   | 3.9.2  | 2.13.6   |
+| 0.5.0   | 3.9.0  | 2.12.0   |
+| 0.4.0   | 3.8.3  | 2.10.16  |
+| 0.3.0   | 3.8.1  | 2.7.8    |
 
 ## Documentation
 

build.gradle.kts

@@ -1,20 +1,19 @@
-val vertxVersion = "4.0.0"
-val awsSdkVersion = "2.15.45"
-val junit5Version = "5.7.0"
-val logbackVersion = "1.2.3"
+val vertxVersion = "4.2.4"
+val awsSdkVersion = "2.17.129"
+val junit5Version = "5.8.2"
+val logbackVersion = "1.2.10"
 val integrationOption = "tests.integration"
 
 group = "io.reactiverse"
-version = "1.0.0"
+version = "1.1.0-SNAPSHOT"
 
 plugins {
     `java-library`
     `maven-publish`
+    signing
     jacoco
-    id("com.jfrog.bintray") version "1.8.5"
-    id("com.jaredsburrows.license") version "0.8.42"
-    id("org.sonarqube") version "3.0"
-    id("com.github.ben-manes.versions") version "0.34.0"
+    id("org.sonarqube") version "3.3"
+    id("com.github.ben-manes.versions") version "0.42.0"
 }
 
 // In order to publish SNAPSHOTs to Sonatype Snapshots repository => the CI should define such `ossrhUsername` and `ossrhPassword` properties
@@ -27,26 +26,7 @@ if (!project.hasProperty("ossrhPassword")) {
     project.extra["ossrhPassword"] = "bar"
 }
 
-// Releases are published to Bintray under the Reactiverse organization
-// Then manually synced to Central
-bintray {
-    user    = System.getenv("BINTRAY_USER")
-    key     = System.getenv("BINTRAY_KEY")
-    with(pkg) {
-        userOrg = "reactiverse"
-        repo = "releases"
-        name = project.name
-        setLicenses("Apache-2.0")
-        vcsUrl = "https://github.com/reactiverse/aws-sdk"
-        setLabels("vertx", "vert.x", "aws-sdk", "amazon web services")
-        publicDownloadNumbers = true
-        with(version) {
-            name = project.version.toString()
-            description = "${project.description}. Version: ${project.version}"
-        }
-        setPublications("mavenJava")
-    }
-}
+extra["isReleaseVersion"] = !version.toString().endsWith("SNAPSHOT")
 
 repositories {
     mavenCentral()
@@ -68,7 +48,7 @@ dependencies {
 
     testImplementation("io.vertx:vertx-junit5:$vertxVersion")
     testImplementation("io.vertx:vertx-rx-java2:$vertxVersion")
-    testImplementation("cloud.localstack:localstack-utils:0.2.5")
+    testImplementation("cloud.localstack:localstack-utils:0.2.20")
     testImplementation("ch.qos.logback:logback-classic:$logbackVersion")
     testImplementation("ch.qos.logback:logback-core:$logbackVersion")
     testImplementation("software.amazon.awssdk:aws-sdk-java:$awsSdkVersion")
@@ -81,7 +61,7 @@ java {
 }
 
 jacoco {
-    toolVersion = "0.8.5"
+    toolVersion = "0.8.7"
 }
 
 tasks {
@@ -94,9 +74,9 @@ tasks {
     jacocoTestReport {
         dependsOn(":test")
         reports {
-            xml.isEnabled = true
-            csv.isEnabled = false
-            html.destination = file("$buildDir/jacocoHtml")
+            xml.required.set(true)
+            csv.required.set(false)
+            html.outputLocation.set(file("$buildDir/jacocoHtml"))
         }
     }
 
@@ -141,8 +121,16 @@ tasks {
         )
     }
 
+    withType<Sign> {
+      onlyIf { project.extra["isReleaseVersion"] as Boolean }
+    }
+
     withType<Wrapper> {
-        gradleVersion = "6.5"
+      gradleVersion = "7.4"
+    }
+
+    withType<JavaCompile> {
+      options.compilerArgs.add("-Xlint:deprecation")
     }
 }
 
@@ -177,23 +165,30 @@ publishing {
                 }
             }
             repositories {
-                // To locally check out the poms
-                maven {
-                    name = "BuildDir"
-                    url = uri("$buildDir/repos/snapshots")
-                }
-                // Snapshots are published to Sonatype's repository directly
-                maven {
-                    name = "SonatypeOSS"
-                    url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-                    credentials {
-                        val ossrhUsername: String by project
-                        val ossrhPassword: String by project
-                        username = ossrhUsername
-                        password = ossrhPassword
-                    }
+              // To locally check out the poms
+              maven {
+                val releasesRepoUrl = uri("$buildDir/repos/releases")
+                val snapshotsRepoUrl = uri("$buildDir/repos/snapshots")
+                name = "BuildDir"
+                url = if (project.extra["isReleaseVersion"] as Boolean) releasesRepoUrl else snapshotsRepoUrl
+              }
+              maven {
+                val releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                val snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+                name = "SonatypeOSS"
+                url = if (project.extra["isReleaseVersion"] as Boolean) releasesRepoUrl else snapshotsRepoUrl
+                credentials {
+                  val ossrhUsername: String by project
+                  val ossrhPassword: String by project
+                  username = ossrhUsername
+                  password = ossrhPassword
                 }
+              }
             }
         }
     }
 }
+
+signing {
+  sign(publishing.publications["mavenJava"])
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists