Skip to content

Commit 921de5b

Browse files
authored
Merge pull request #163 from authzed/dependabot/gradle/gradle-4fe10c4ce6
chore: Walk java versions, bump gradle version, bump deps
2 parents 9229b18 + 452e52d commit 921de5b

8 files changed

Lines changed: 106 additions & 116 deletions

File tree

.github/workflows/build.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
name: "build"
22
on:
3-
push:
4-
branches:
5-
- "!dependabot/*"
6-
- "*"
73
pull_request:
84
branches:
95
- "*"
@@ -23,9 +19,9 @@ jobs:
2319
strategy:
2420
matrix:
2521
java: # https://endoflife.date/oracle-jdk
26-
- 8 # Oldest
22+
- 17 # Oldest
2723
- 21 # LTS
28-
- 24 # Latest
24+
- 25 # Latest (though also LTS)
2925
name: "Java ${{ matrix.java }} Build"
3026
steps:
3127
- uses: "actions/checkout@v6"

.github/workflows/lint.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
---
22
name: "Lint"
33
on: # yamllint disable-line rule:truthy
4-
push:
5-
branches:
6-
- "!dependabot/*"
7-
- "main"
84
pull_request:
95
branches: ["*"]
106
merge_group:

.github/workflows/publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
distribution: "adopt"
1616
java-package: "jdk"
17-
java-version: "17" # LTS
17+
java-version: "25" # LTS
1818
- uses: "bufbuild/buf-setup-action@v1"
1919
with:
2020
version: "1.18.0"

build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99

1010
repositories {
1111
// The Google mirror is less flaky than mavenCentral()
12-
maven { url "https://maven-central.storage-download.googleapis.com/maven2/" }
12+
maven { url = "https://maven-central.storage-download.googleapis.com/maven2/" }
1313
mavenCentral()
1414
mavenLocal()
1515
}
@@ -73,21 +73,23 @@ signing {
7373
java {
7474
withJavadocJar()
7575
withSourcesJar()
76-
sourceCompatibility = JavaVersion.VERSION_1_8
77-
targetCompatibility = JavaVersion.VERSION_1_8
76+
sourceCompatibility = JavaVersion.VERSION_17
77+
targetCompatibility = JavaVersion.VERSION_17
7878
}
7979

8080
tasks.sourcesJar {
8181
// This is necessary to keep gradle from barking at you
8282
// about an implicit dependency between these two tasks.
8383
dependsOn tasks.compileJava
84+
dependsOn tasks.compileTestJava
85+
dependsOn tasks.generateTestProto
8486
}
8587

8688
// All it does is complain about generated code.
8789
javadoc { options.addStringOption('Xdoclint:none', '-quiet') }
8890

8991
def grpcVersion = "1.78.0"
90-
def protocVersion = "4.33.2"
92+
def protocVersion = "4.33.5"
9193
def authzedProtoCommit = "v1.45.4"
9294
def bufDir = "${buildDir}/buf"
9395
def protocPlatformTag = project.findProperty('protoc_platform') ? ":${protoc_platform}" : ""
@@ -129,7 +131,7 @@ dependencies {
129131
exclude group: 'com.google.protobuf', module: 'protobuf-java'
130132
exclude group: 'com.google.code.gson', module: 'gson'
131133
}
132-
implementation("com.google.api.grpc:proto-google-common-protos:2.63.2") {
134+
implementation("com.google.api.grpc:proto-google-common-protos:2.65.0") {
133135
exclude group: 'com.google.protobuf', module: 'protobuf-java'
134136
}
135137
implementation "com.google.code.gson:gson:2.13.2"
@@ -178,7 +180,7 @@ configurations {
178180
// Test things
179181
dependencies {
180182
intTestImplementation "junit:junit:4.13.2"
181-
intTestImplementation "org.assertj:assertj-core:3.27.6"
183+
intTestImplementation "org.assertj:assertj-core:3.27.7"
182184
}
183185

184186
tasks.register('integrationTest', Test) {

gradle/wrapper/gradle-wrapper.jar

2.35 KB
Binary file not shown.

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-8.14-rc-1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

100644100755
Lines changed: 93 additions & 94 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)