diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f9517b2..f6c0883 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,24 +26,21 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up Java - uses: actions/setup-java@v3.13.0 + uses: actions/setup-java@v4 with: - distribution: 'zulu' - java-version: 11 + distribution: 'temurin' + java-version: 17 - - name: Build and test with Gradle - uses: gradle/gradle-build-action@v2.12.0 - with: - arguments: build + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 -# - name: Publish snapshot -# if: ${{ (github.event_name == 'push') || (github.event_name == 'workflow_dispatch') }} -# run: ./gradlew publishToSonatype "-Psemver.stage=snapshot" + - name: Build and test with Gradle + run: ./gradlew build - name: Stop Gradle daemons run: ./gradlew --stop diff --git a/.github/workflows/generate-tag.yaml b/.github/workflows/generate-tag.yaml index 12181f7..fae106e 100644 --- a/.github/workflows/generate-tag.yaml +++ b/.github/workflows/generate-tag.yaml @@ -31,20 +31,21 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up Java - uses: actions/setup-java@v3.13.0 + uses: actions/setup-java@v4 with: - distribution: 'zulu' - java-version: 11 + distribution: 'temurin' + java-version: 17 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 - name: Build with Gradle - uses: gradle/gradle-build-action@v2.12.0 - with: - arguments: build -x spotlessCheck "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}" + run: ./gradlew build -x spotlessCheck "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}" - name: Stop Gradle daemons run: ./gradlew --stop @@ -63,15 +64,16 @@ jobs: token: ${{ secrets.TOKEN_GITHUB_ACTION }} - name: Set up Java - uses: actions/setup-java@v3.13.0 + uses: actions/setup-java@v4 with: - distribution: 'zulu' - java-version: 11 + distribution: 'temurin' + java-version: 17 - - name: Generate Tag - uses: gradle/gradle-build-action@v2.12.0 - with: - arguments: createSemverTag "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}" + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + + - name: Generate tag + run: ./gradlew createSemverTag "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}" - name: Push changes to tag run: git push --follow-tags diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 615e7e7..42b080d 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -21,28 +21,29 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up Java - uses: actions/setup-java@v3.13.0 + uses: actions/setup-java@v4 with: - distribution: 'zulu' - java-version: 11 + distribution: 'temurin' + java-version: 17 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 - name: Build and test with Gradle - uses: gradle/gradle-build-action@v2.12.0 - with: - arguments: build -x spotlessCheck --scan --stacktrace + run: ./gradlew build -x spotlessCheck --scan --stacktrace - name: Import GPG key - uses: crazy-max/ghaction-import-gpg@v5 + uses: crazy-max/ghaction-import-gpg@v6 with: gpg_private_key: ${{ secrets.SIGNING_KEY }} passphrase: ${{ secrets.SIGNING_KEY_PASSPHRASE }} - - name: Publish to MavenCentral + - name: Publish to Maven Central run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository - name: Publish to Gradle Plugin Portal diff --git a/arrow-gradle-config-dokka-fence-workaround/src/main/kotlin/DokkaFenceWorkaround.kt b/arrow-gradle-config-dokka-fence-workaround/src/main/kotlin/DokkaFenceWorkaround.kt index 29c32c8..fe966b8 100644 --- a/arrow-gradle-config-dokka-fence-workaround/src/main/kotlin/DokkaFenceWorkaround.kt +++ b/arrow-gradle-config-dokka-fence-workaround/src/main/kotlin/DokkaFenceWorkaround.kt @@ -266,7 +266,7 @@ class PatchedDocTagToContentConverter : DocTagToContentConverter() { dci: DCI, sourceSets: Set, styles: Set