Skip to content

Commit

Permalink
Merge branch 'master' into renovate/org.jetbrains.kotlinx.binary-comp…
Browse files Browse the repository at this point in the history
…atibility-validator-0.x
  • Loading branch information
magner669 authored Aug 27, 2024
2 parents 4459287 + 053b573 commit 1805a0d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pre-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@ jobs:
steps:
# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle#using-the-gradle-starter-workflow
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

# https://github.com/marketplace/actions/setup-java-jdk
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.jdk }}
distribution: 'temurin'

# https://github.com/marketplace/actions/gradle-wrapper-validation
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/wrapper-validation-action@v3

# https://github.com/marketplace/actions/gradle-build-action
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-home-cache-cleanup: true
arguments: build --stacktrace --info
8 changes: 4 additions & 4 deletions .github/workflows/publish-documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ jobs:
steps:
# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle#using-the-gradle-starter-workflow
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

# https://github.com/marketplace/actions/setup-java-jdk
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'

# https://github.com/marketplace/actions/gradle-wrapper-validation
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/wrapper-validation-action@v3

# https://github.com/marketplace/actions/gradle-build-action
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
arguments: asciidoctor

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,29 @@ jobs:
# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle#using-the-gradle-starter-workflow
- name: Branch Check
if: github.ref != 'refs/heads/master'
uses: actions/github-script@v3
uses: actions/github-script@v7
with:
script: |
core.setFailed('This workflow must run on master branch only')
# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle#using-the-gradle-starter-workflow
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

# https://github.com/marketplace/actions/setup-java-jdk
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'

# https://github.com/marketplace/actions/gradle-wrapper-validation
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/wrapper-validation-action@v3

# https://github.com/marketplace/actions/gradle-build-action
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-home-cache-cleanup: true
# Secrets are uploaded via https://docs.github.com/en/actions/security-guides/encrypted-secrets
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ okhttp = "4.12.0"
jackson = "2.17.2"
# No need to keep the same Kotlin version with Gradle, at least because kotlin runtime is a transitive dependency of okhttp
kotlin = "1.9.23"
junit = "5.10.3"
junit = "5.11.0"

[libraries]
snakeyaml = "org.yaml:snakeyaml:2.2"
Expand Down

0 comments on commit 1805a0d

Please sign in to comment.