Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- name: Checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

- name: Set Docker API version
Expand Down Expand Up @@ -67,10 +67,10 @@ jobs:
- name: Checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

- name: Set Docker API version
Expand All @@ -86,7 +86,7 @@ jobs:
uses: dev-vince/actions-publish-javadoc@4004c6ca5881690e83c49a28a0b16fcab089e860 # v1.0.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
java-version: "17"
java-version: "21"
java-distribution: "adopt" # The distributor of the target JDK. See https://github.com/actions/setup-java for more information.
project: gradle # The project type.
branch: "gh-pages" # The branch for the javadoc contents.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
- name: Checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

- name: Set Docker API version
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ and emitted into the `build/generated/source directory`, and included in compila

Ensure the following are installed and available in the `PATH`.

- [Java 17](https://www.azul.com/downloads/?version=java-17-lts&package=jdk#zulu)
- [Java 21](https://www.azul.com/downloads/?version=java-21-lts&package=jdk#zulu)
- [Gradle](https://gradle.org/install/#with-a-package-manager).
- [Docker](https://docs.docker.com/engine/install/) for tests.

Expand Down
16 changes: 10 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ plugins {
id 'signing'
id 'maven-publish'

id 'com.google.protobuf' version '0.9.4'
id 'com.google.protobuf' version '0.10.0'
id 'net.ltgt.errorprone' version '5.1.0'
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
id 'com.diffplug.spotless' version '6.22.0'
Expand Down Expand Up @@ -79,22 +79,22 @@ jar {
}
}

def grpcVersion = '1.75.0'
def grpcVersion = '1.81.0'
def protocVersion = '3.25.5'
def slf4jVersion = '2.0.14'
def testcontainersVersion = '1.20.1'
def slf4jVersion = '2.0.18'
def testcontainersVersion = '1.21.4'
def jUnitVersion = '6.1.0'

dependencies {
errorprone "com.uber.nullaway:nullaway:0.10.18"
errorprone "com.uber.nullaway:nullaway:0.13.6"

api "io.grpc:grpc-protobuf:${grpcVersion}"
api "io.grpc:grpc-stub:${grpcVersion}"
implementation "org.slf4j:slf4j-api:${slf4jVersion}"

compileOnly "org.apache.tomcat:annotations-api:6.0.53"

errorprone "com.google.errorprone:error_prone_core:2.29.2"
errorprone "com.google.errorprone:error_prone_core:2.49.0"

runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"

Expand Down Expand Up @@ -164,6 +164,10 @@ extractIncludeProto {
dependsOn downloadProtos
}

processProtoResources {
dependsOn downloadProtos
}

protobuf {
protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" }
plugins {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
implementation 'org.ajoberstar.grgit:grgit-gradle:5.0.0'
implementation 'org.ajoberstar.grgit:grgit-gradle:5.3.3'
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
implementation 'org.apache.commons:commons-compress:1.23.0'
implementation 'org.apache.commons:commons-compress:1.28.0'
}

repositories {
Expand Down
Loading