From 59a2826d16c263be473687650324e572022f24f5 Mon Sep 17 00:00:00 2001 From: Tanner Stirrat Date: Tue, 27 Aug 2024 12:33:12 -0600 Subject: [PATCH 1/5] Bump protoc version --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e9e30829..cd7504a3 100644 --- a/build.gradle +++ b/build.gradle @@ -77,8 +77,8 @@ java { // All it does is complain about generated code. javadoc { options.addStringOption('Xdoclint:none', '-quiet') } -def grpcVersion = "1.65.1" -def protocVersion = "3.25.3" +def grpcVersion = "1.66.0" +def protocVersion = "4.27.3" def authzedProtoCommit = "v1.35.0" def bufDir = "${buildDir}/buf" def protocPlatformTag = project.findProperty('protoc_platform') ? ":${protoc_platform}" : "" From 7104bc13151801520bdb07645b19b8a3f133ef43 Mon Sep 17 00:00:00 2001 From: Tanner Stirrat Date: Tue, 27 Aug 2024 12:50:24 -0600 Subject: [PATCH 2/5] Bump to most recent gradle version --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac0856be..707e499a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 903a1affbb95ae0b57c1b486ac0189b19c1e9cdc Mon Sep 17 00:00:00 2001 From: Tanner Stirrat Date: Tue, 27 Aug 2024 13:31:10 -0600 Subject: [PATCH 3/5] Add protobuf-java implementation --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index cd7504a3..172fb086 100644 --- a/build.gradle +++ b/build.gradle @@ -91,6 +91,7 @@ sourceSets { main { dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" + implementation "com.google.protobuf:protobuf-java:${protocVersion}" implementation "io.grpc:grpc-stub:${grpcVersion}" runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}" compileOnly "org.apache.tomcat:annotations-api:6.0.53" From 6261af569ee5856d4585a1f3a3e1ad357fb347b5 Mon Sep 17 00:00:00 2001 From: Tanner Stirrat Date: Tue, 27 Aug 2024 13:33:42 -0600 Subject: [PATCH 4/5] Remove deprecated overridden method --- src/main/java/com/authzed/grpcutil/BearerToken.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/authzed/grpcutil/BearerToken.java b/src/main/java/com/authzed/grpcutil/BearerToken.java index 5c52d577..0e0cb0ff 100644 --- a/src/main/java/com/authzed/grpcutil/BearerToken.java +++ b/src/main/java/com/authzed/grpcutil/BearerToken.java @@ -32,9 +32,4 @@ public void applyRequestMetadata(RequestInfo requestInfo, Executor executor, Met } }); } - - @Override - public void thisUsesUnstableApi() { - // Intentionally empty - } } From 7e90445c1d35cbfa9157cf8de33d5e87ece614f2 Mon Sep 17 00:00:00 2001 From: Tanner Stirrat Date: Wed, 4 Sep 2024 16:26:08 -0600 Subject: [PATCH 5/5] Fix build failures, add comments --- build.gradle | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 172fb086..b822d1e6 100644 --- a/build.gradle +++ b/build.gradle @@ -66,19 +66,25 @@ signing { sign publishing.publications.authzed } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 java { withJavadocJar() withSourcesJar() + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +tasks.sourcesJar { + // This is necessary to keep gradle from barking at you + // about an implicit dependency between these two tasks. + dependsOn tasks.compileJava } // All it does is complain about generated code. javadoc { options.addStringOption('Xdoclint:none', '-quiet') } def grpcVersion = "1.66.0" -def protocVersion = "4.27.3" +def protocVersion = "4.27.4" def authzedProtoCommit = "v1.35.0" def bufDir = "${buildDir}/buf" def protocPlatformTag = project.findProperty('protoc_platform') ? ":${protoc_platform}" : "" @@ -140,6 +146,7 @@ configurations { intTestRuntimeOnly.extendsFrom runtimeOnly } +// Test things dependencies { intTestImplementation "junit:junit:4.13.2" }