Use protobuf package for gRPC service qualification, not the Kotlin p…

…ackage (#49)

* use protobuf package for gRPC service qualification, not the kotlin package

* gradle 6.4 and depend on grpc-stub

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/ServiceAnnotator.kt

@@ -38,7 +38,7 @@ internal object ServiceAnnotator {
         if (ctx.pkg.default) {
             s.name
         } else {
-            "${ctx.pkg}.${s.name}"
+            "${ctx.desc.packageName}.${s.name}"
         }
 
     private fun renderDescriptor(s: Service) =

testing/plugin-options/ignore-java-package/build.gradle.kts

@@ -30,3 +30,8 @@ sourceSets {
 protokt {
     respectJavaPackage = false
 }
+
+dependencies {
+    implementation(project(":protokt-runtime-grpc"))
+    implementation(libraries.grpcStub)
+}

testing/runtime-tests/build.gradle.kts

@@ -18,7 +18,9 @@ pureKotlin()
 
 dependencies {
     implementation(kotlin("reflect"))
+    implementation(project(":protokt-runtime-grpc"))
     implementation(project(":testing:protobuf-java"))
+    implementation(libraries.grpcStub)
 
     testImplementation(libraries.jackson)
     testImplementation(libraries.protobuf)

testing/runtime-tests/src/main/proto/toasttab/protokt/testing/rt/service_package.proto

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2020 Toast Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto3";
+
+package toasttab.protokt.testing.rt;
+
+option java_package = "com.toasttab.protokt.testing.rt";
+
+service TestService {}

testing/runtime-tests/src/test/kotlin/com/toasttab/protokt/testing/rt/ServicePackageTest.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2020 Toast Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.toasttab.protokt.testing.rt
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.jupiter.api.Test
+
+class ServicePackageTest {
+    @Test
+    fun `service has protobuf package`() {
+        assertThat(TestServiceGrpc.SERVICE_NAME.substringBeforeLast("."))
+            .isEqualTo("toasttab.protokt.testing.rt")
+    }
+}