Merge pull request #18 from samkim/api-v1

Add v1 API

Author: samkim

.github/workflows/build.yaml

@@ -27,3 +27,25 @@ jobs:
     - uses: "gradle/wrapper-validation-action@v1"
     - name: "Gradle Build"
       run: "./gradlew build"
+  test:
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        java: [ 8, 11, 16 ] # Oldest, LTS, Latest
+    name: "Java ${{ matrix.java }} Test"
+    steps:
+      - uses: "actions/checkout@v2"
+      - uses: "actions/setup-java@v2"
+        with:
+          distribution: "adopt"
+          java-package: "jdk"
+          java-version: "${{ matrix.java }}"
+      - uses: "bufbuild/buf-setup-action@v0.2.0"
+        with:
+          version: "0.48.2"
+      - uses: "authzed/action-spicedb@v1"
+        with:
+          version: "latest"
+      - uses: "gradle/wrapper-validation-action@v1"
+      - name: "Gradle integrationTest"
+        run: "./gradlew integrationTest --info"

build.gradle

@@ -79,10 +79,16 @@ javadoc { options.addStringOption('Xdoclint:none', '-quiet') }
 
 def grpcVersion = "1.39.0"
 def protocVersion = "3.17.3"
-def authzedProtoCommit = "12963402f4474d528d5c14a5162db287"
+def authzedProtoCommit = "47e8bd10f0614fed8a7a0e26cab74e7b"
 def bufDir = "${buildDir}/buf"
 def protocPlatformTag = project.findProperty('protoc_platform') ? ":${protoc_platform}" : ""
 
+sourceSets { main {
+  proto { srcDir bufDir }
+  java  { srcDir "$buildDir/generated" }
+  java  { srcDir "$buildDir/src" }
+}}
+
 dependencies {
   implementation "io.grpc:grpc-protobuf:${grpcVersion}"
   implementation "io.grpc:grpc-stub:${grpcVersion}"
@@ -92,20 +98,20 @@ dependencies {
 
 task validateProtos(type: Exec) {
   mkdir bufDir
-  commandLine("buf", "export", "--exclude-imports", "buf.build/beta/protoc-gen-validate", "-o", bufDir)
+  commandLine("buf", "export", "--exclude-imports", "buf.build/envoyproxy/protoc-gen-validate", "-o", bufDir)
+}
+
+task gatewayProtos(type: Exec) {
+  mkdir bufDir
+  commandLine("buf", "export", "--exclude-imports", "buf.build/grpc-ecosystem/grpc-gateway", "-o", bufDir)
 }
 
 task authzedProtos(type: Exec) {
   dependsOn validateProtos
+  dependsOn gatewayProtos
   commandLine("buf", "export", "--exclude-imports", "buf.build/authzed/api:${authzedProtoCommit}", "-o", bufDir)
 }
 
-sourceSets { main {
-  proto { srcDir bufDir }
-  java  { srcDir "$buildDir/generated" }
-  java  { srcDir "$buildDir/src" }
-}}
-
 protobuf {
   protoc { artifact = "com.google.protobuf:protoc:${protocVersion}${protocPlatformTag}" }
   plugins { grpc { artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}${protocPlatformTag}" } }
@@ -120,3 +126,30 @@ tasks.named("jar") { manifest {
   attributes("Implementation-Title": project.name,
              "Implementation-Version": project.version)
 }}
+
+sourceSets {
+  intTest {
+    compileClasspath += sourceSets.main.output
+    runtimeClasspath += sourceSets.main.output
+  }
+}
+
+configurations {
+    intTestImplementation.extendsFrom implementation
+    intTestRuntimeOnly.extendsFrom runtimeOnly
+}
+
+dependencies {
+  intTestImplementation "junit:junit:4.13"
+}
+
+tasks.register('integrationTest', Test) {
+    useJUnit()
+
+    description = 'Runs integration tests.'
+    group = 'verification'
+
+    testClassesDirs = sourceSets.intTest.output.classesDirs
+    classpath = sourceSets.intTest.runtimeClasspath
+    shouldRunAfter test
+}