Skip to content

Commit

Permalink
chore(deps): upgrade dependencies (#226)
Browse files Browse the repository at this point in the history
  • Loading branch information
v1nc3n4 authored Jun 8, 2024
1 parent 51d21c3 commit d342389
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 33 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, macos-12, windows-2022]
os: [ubuntu-22.04, macos-14, windows-2022]

steps:
- name: Init Ubuntu environment
if: matrix.os == 'ubuntu-22.04'
run: sudo rm -f /usr/local/bin/node /usr/local/bin/npm /usr/local/bin/pnpm /usr/local/bin/yarn

- name: Init MacOS environment
if: matrix.os == 'macos-12'
if: matrix.os == 'macos-14'
run: sudo rm -f /usr/local/bin/node /usr/local/bin/npm /usr/local/bin/pnpm /usr/bin/yarn /Users/runner/.yarn/bin/yarn

- name: Init Windows environment
Expand All @@ -31,26 +31,26 @@ jobs:
Rename-Item "C:\npm" "npm.old" -Force
- name: Git checkout for source code analysis
uses: actions/checkout@v3
uses: actions/checkout@v4
if: matrix.os == 'ubuntu-22.04'
with:
fetch-depth: 0

- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
if: matrix.os != 'ubuntu-22.04'
with:
fetch-depth: 1

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '17'
architecture: x64

- name: Cache Gradle's cache and wrapper
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches/
Expand All @@ -60,7 +60,7 @@ jobs:
${{ runner.os }}-gradle-
- name: Cache Sonar's cache
uses: actions/cache@v3
uses: actions/cache@v4
if: matrix.os == 'ubuntu-22.04'
with:
path: |
Expand All @@ -75,7 +75,7 @@ jobs:
run: ./gradlew :plugin:jacocoTestReport --console=plain

- name: Build plugin on MacOS
if: matrix.os == 'macos-12'
if: matrix.os == 'macos-14'
run: ./gradlew :plugin:build --console=plain

- name: Build plugin on Windows
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 2 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
38 changes: 19 additions & 19 deletions plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,24 @@ configurations["intTestRuntimeOnly"]

dependencies {
implementation(gradleApi())
implementation("io.github.resilience4j:resilience4j-retry:2.1.0")
implementation("org.apache.httpcomponents.client5:httpclient5:5.2.1")
implementation("org.apache.commons:commons-compress:1.23.0")
implementation("org.json:json:20230618")
compileOnly("org.projectlombok:lombok:1.18.28")
annotationProcessor("org.projectlombok:lombok:1.18.28")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.0")
testImplementation("org.mockito:mockito-core:5.4.0")
testImplementation("org.mockito:mockito-junit-jupiter:5.4.0")
testImplementation("org.junit-pioneer:junit-pioneer:2.0.1")
testImplementation("org.assertj:assertj-core:3.24.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
testCompileOnly("org.projectlombok:lombok:1.18.28")
testAnnotationProcessor("org.projectlombok:lombok:1.18.28")

intTestImplementation("com.github.tomakehurst:wiremock:2.27.2")
implementation("io.github.resilience4j:resilience4j-retry:2.2.0")
implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1")
implementation("org.apache.commons:commons-compress:1.26.2")
implementation("org.json:json:20240303")
compileOnly("org.projectlombok:lombok:1.18.32")
annotationProcessor("org.projectlombok:lombok:1.18.32")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.2")
testImplementation("org.mockito:mockito-core:5.12.0")
testImplementation("org.mockito:mockito-junit-jupiter:5.12.0")
testImplementation("org.junit-pioneer:junit-pioneer:2.2.0")
testImplementation("org.assertj:assertj-core:3.26.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testCompileOnly("org.projectlombok:lombok:1.18.32")
testAnnotationProcessor("org.projectlombok:lombok:1.18.32")

intTestImplementation("org.wiremock:wiremock:3.6.0")
}

tasks.named<Wrapper>("wrapper") {
Expand Down Expand Up @@ -122,7 +122,7 @@ idea {
}

jacoco {
toolVersion = "0.8.10"
toolVersion = "0.8.11"
}

gradlePlugin {
Expand Down
6 changes: 3 additions & 3 deletions plugin/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ val fgpArtifactId: String by extra

pluginManagement {
plugins {
id("com.gradle.enterprise") version "3.13.1"
id("com.gradle.plugin-publish") version "1.2.0"
id("org.sonarqube") version "4.0.0.2929"
id("com.gradle.enterprise") version "3.17.4"
id("com.gradle.plugin-publish") version "1.2.1"
id("org.sonarqube") version "5.0.0.4638"
}
}

Expand Down
2 changes: 1 addition & 1 deletion site/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
}

frontend {
nodeVersion.set("20.12.2")
nodeVersion.set("20.14.0")
assembleScript.set("run generate")
cleanScript.set("run clean")
publishScript.set("run deploy")
Expand Down

0 comments on commit d342389

Please sign in to comment.