Skip to content

Commit

Permalink
Merge pull request #99 from authzed/bump-build-dep-versions
Browse files Browse the repository at this point in the history
Bump protoc and gRPC versions for generated code
  • Loading branch information
tstirrat15 authored Sep 5, 2024
2 parents eb43b75 + 7e90445 commit edf094d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
16 changes: 12 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.65.1"
def protocVersion = "3.25.3"
def grpcVersion = "1.66.0"
def protocVersion = "4.27.4"
def authzedProtoCommit = "v1.35.0"
def bufDir = "${buildDir}/buf"
def protocPlatformTag = project.findProperty('protoc_platform') ? ":${protoc_platform}" : ""
Expand All @@ -91,6 +97,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"
Expand Down Expand Up @@ -139,6 +146,7 @@ configurations {
intTestRuntimeOnly.extendsFrom runtimeOnly
}

// Test things
dependencies {
intTestImplementation "junit:junit:4.13.2"
}
Expand Down
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-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
5 changes: 0 additions & 5 deletions src/main/java/com/authzed/grpcutil/BearerToken.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,4 @@ public void applyRequestMetadata(RequestInfo requestInfo, Executor executor, Met
}
});
}

@Override
public void thisUsesUnstableApi() {
// Intentionally empty
}
}

0 comments on commit edf094d

Please sign in to comment.