Skip to content

Commit fa25e44

Browse files
Merge branch 'main' into renovate/grpc-java-monorepo
2 parents a8d2383 + aac1549 commit fa25e44

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
java-version: "18"
2424
cache: "gradle"
2525
- name: Validate Gradle wrapper
26-
uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c
26+
uses: gradle/actions/wrapper-validation@263d8fe18eb54ae581bcdc2e263c5a49173958a3
2727
- name: Build package
2828
run: ./gradlew build

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
java-version: "18"
2121
cache: "gradle"
2222
- name: Validate Gradle wrapper
23-
uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c
23+
uses: gradle/actions/wrapper-validation@263d8fe18eb54ae581bcdc2e263c5a49173958a3
2424
- name: Setup Gradle
25-
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c
25+
uses: gradle/actions/setup-gradle@263d8fe18eb54ae581bcdc2e263c5a49173958a3
2626
- name: Publish Package
2727
env:
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/regen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
java-version: "18"
2929
cache: "gradle"
3030
- name: Validate Gradle wrapper
31-
uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c
31+
uses: gradle/actions/wrapper-validation@263d8fe18eb54ae581bcdc2e263c5a49173958a3
3232
- name: Generate code
3333
run: |
3434
make clone-proto

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies {
4444

4545
testImplementation "io.grpc:grpc-testing:${grpcVersion}"
4646
testImplementation "junit:junit:4.13.2"
47-
testImplementation "org.mockito:mockito-core:5.21.0"
47+
testImplementation "org.mockito:mockito-core:5.23.0"
4848
}
4949

5050
protobuf {

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)