diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 458b633..93fa37e 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: java_version: [11, 17, 18] # Test all LTS releases and the latest one - os: [windows-latest, macOS-latest, ubuntu-latest] + os: [windows-latest, macOS-13, macOS-14, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v3 @@ -28,41 +28,8 @@ jobs: uses: gradle/gradle-build-action@v2.7.0 with: arguments: check - coverage: - runs-on: ubuntu-latest - needs: - - test - name: "📄 Codecov Report" - strategy: - matrix: - test-type: [unit, integration] - steps: - - name: Setup Java JDK - uses: actions/setup-java@v3.12.0 - with: - distribution: 'temurin' - java-version: '17' - - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Validate Wrapper - uses: gradle/wrapper-validation-action@v1 - - - name: Setup and Run Gradle - uses: gradle/gradle-build-action@v2.7.0 - with: - arguments: ${{ matrix.test-type }}TestsCoverageReport - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3.1.4 - with: - files: "${{ github.workspace }}/build/reports/jacoco/${{ matrix.test-type }}TestsCoverageReport/${{ matrix.test-type }}TestsCoverageReport.xml" - flags: "${{ matrix.test-type }}Tests" - verbose: true - token: "${{ secrets.CODECOV_TOKEN }}" publish: - if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && github.repository == 'javalin/javalin-ssl' + if: github.ref == 'refs/heads/5.x' && github.event_name != 'pull_request' && github.repository == 'javalin/javalin-ssl' needs: - test name: "🛫 Publish to maven repo" @@ -75,7 +42,7 @@ jobs: uses: actions/setup-java@v3.12.0 with: distribution: 'zulu' - java-version: '17' + java-version: '11' - name: Generate version uses: HardNorth/github-version-generate@v1.3.0 @@ -110,48 +77,13 @@ jobs: with: arguments: publishToSonatype closeAndReleaseStagingRepository - - name: Create Pre-Release - if: contains(env.CURRENT_VERSION, 'SNAPSHOT') - uses: ncipollo/release-action@v1.12.0 - with: - tag: ${{ env.CURRENT_VERSION }} - generateReleaseNotes: true - commit: main - prerelease: true - body: | - ## Download Instructions - ### Maven - ```xml - - reposilite-repository-snapshots - Reposilite Repository - https://maven.reposilite.com/snapshots - - ``` - ```xml - - io.javalin.community.ssl - ssl-plugin - ${{ env.CURRENT_VERSION }} - - ``` - ### Gradle - ```groovy - maven { - url "https://maven.reposilite.com/snapshots" - } - ``` - ```groovy - implementation('io.javalin.community.ssl:ssl-plugin:${{ env.CURRENT_VERSION }}') - ``` - - name: Create Release if: "!contains(env.CURRENT_VERSION, 'SNAPSHOT')" uses: ncipollo/release-action@v1.12.0 with: tag: ${{ env.CURRENT_VERSION }} generateReleaseNotes: true - commit: main + commit: 5.x body: | ## Download Instructions ### Maven diff --git a/build.gradle b/build.gradle index 8ac1a78..8263089 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { group = 'io.javalin.community.ssl' //Must be formatted following the RegEx: /version\s*=\s*'\S+'/g -version = '5.6.3' +version = '5.6.4-SNAPSHOT' jacoco { toolVersion = '0.8.8' @@ -42,11 +42,11 @@ configurations { } dependencies { - def javalin = "5.6.2" - def junit = '5.10.0' - def sslContextKickstart = '8.1.5' - def okhttp = "4.11.0" - def annotations = "24.0.1" + def javalin = "5.6.4-SNAPSHOT" + def junit = '5.10.2' + def sslContextKickstart = '8.3.2' + def okhttp = "4.12.0" + def annotations = "24.1.0" compileOnly("org.jetbrains:annotations:$annotations") @@ -56,7 +56,6 @@ dependencies { implementation("org.eclipse.jetty.http2:http2-server") implementation("org.eclipse.jetty:jetty-alpn-conscrypt-server") implementation("org.eclipse.jetty:jetty-alpn-java-server") - //implementation("org.eclipse.jetty.http3:http3-server") implementation("io.github.hakky54:sslcontext-kickstart:$sslContextKickstart") implementation("io.github.hakky54:sslcontext-kickstart-for-jetty:$sslContextKickstart")