Merge branch 'kotlinpoet' of https://github.com/andrewparmet/protokt …

…into convert-to-types

extensions/protokt-extensions-proto-based/build.gradle.kts → extensions/protokt-extensions-lite/build.gradle.kts

@@ -13,19 +13,26 @@
  * limitations under the License.
  */
 
+import com.toasttab.protokt.gradle.protokt
 import com.toasttab.protokt.gradle.protoktExtensions
 
-apply(plugin = "kotlin-kapt")
+plugins {
+ kotlin("kapt")
+}
 
 localProtokt()
 enablePublishing()
 trackKotlinApiCompatibility(false)
 
+protokt {
+ lite = true
+}
+
 dependencies {
+ protoktExtensions(project(":extensions:protokt-extensions-simple"))
+
  implementation(project(":extensions:protokt-extensions-api"))
  implementation(libraries.autoServiceAnnotations)
 
- add("kapt", libraries.autoService)
-
- protoktExtensions(project(":extensions:protokt-extensions-simple"))
+ kapt(libraries.autoService)
 }

extensions/protokt-extensions-simple/build.gradle.kts

@@ -13,7 +13,9 @@
  * limitations under the License.
  */
 
-apply(plugin = "kotlin-kapt")
+plugins {
+ kotlin("kapt")
+}
 
 enablePublishing()
 trackKotlinApiCompatibility()
@@ -22,5 +24,5 @@ dependencies {
  implementation(project(":protokt-core"))
  implementation(libraries.autoServiceAnnotations)
 
- add("kapt", libraries.autoService)
+ kapt(libraries.autoService)
 }

extensions/publish/build.gradle.kts → extensions/protokt-extensions/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Toast Inc.
+ * Copyright (c) 2021 Toast Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,21 +13,25 @@
  * limitations under the License.
  */
 
-enablePublishing(defaultJars = false)
+import com.google.protobuf.gradle.proto
+import com.toasttab.protokt.gradle.protokt
+
+localProtokt()
+enablePublishing()
+trackKotlinApiCompatibility(false)
+
+protokt {
+ onlyGenerateDescriptors = true
+}
 
 dependencies {
- api(project(":extensions:protokt-extensions-simple"))
- api(project(":extensions:protokt-extensions-proto-based"))
- api(project(":extensions:protokt-extensions-api"))
+ api(project(":extensions:protokt-extensions-lite"))
 }
 
-configure<PublishingExtension> {
- publications {
- create<MavenPublication>("extensionsJar") {
- from(project.components["java"])
- artifactId = "protokt-extensions"
- version = "${rootProject.version}"
- groupId = "${rootProject.group}"
+sourceSets {
+ main {
+ proto {
+ srcDir("../protokt-extensions-lite/src/main/proto")
  }
  }
 }

protokt-codegen/build.gradle.kts

@@ -88,7 +88,7 @@ tasks.withType<Test> {
 sourceSets {
  main {
  proto {
- srcDir("../protokt-runtime/src/main/resources")
+ srcDir("../extensions/protokt-extensions-lite/src/main/proto")
  }
  }
 }

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/DeserializerAnnotator.kt

@@ -26,7 +26,6 @@ import com.squareup.kotlinpoet.LambdaTypeName
 import com.squareup.kotlinpoet.ParameterSpec
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.TypeSpec
-import com.squareup.kotlinpoet.TypeVariableName
 import com.squareup.kotlinpoet.asTypeName
 import com.squareup.kotlinpoet.buildCodeBlock
 import com.toasttab.protokt.codegen.annotators.Annotator.Context
@@ -97,7 +96,7 @@ private constructor(
 
  addModifiers(KModifier.OVERRIDE)
  addParameter("deserializer", KtMessageDeserializer::class)
- returns(TypeVariableName(msg.name))
+ returns(msg.typeName)
 
  if (properties.isNotEmpty()) {
  properties.forEach { addStatement("var %L", deserializeVar(it)) }
@@ -107,9 +106,7 @@ private constructor(
  beginControlFlow("when(deserializer.readTag())")
  addStatement("0 -> return·%N(%L)", msg.name, constructorLines(properties))
  deserializerInfo.forEach() { addStatement("%L -> %L = %L", it.tag, it.assignment.fieldName, it.assignment.value) }
- // We need to do this statement as two addStatements because otherwise it wraps the line after also, which is invalid Kotlin.
- addStatement("else -> unknownFields = (unknownFields ?: %T.Builder()).also {", UnknownFieldSet::class)
- addStatement("it.add(deserializer.readUnknown()) }")
+ addStatement("else -> unknownFields = (unknownFields ?: %T.Builder()).also·{it.add(deserializer.readUnknown()) }", UnknownFieldSet::class)
  endControlFlow()
  endControlFlow()
  }

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/OneofAnnotator.kt

@@ -105,7 +105,8 @@ private constructor(
  ) =
  Info(
  fieldName = f.fieldName,
- type = if (f.wrapped) {
+ type =
+ if (f.wrapped) {
  interceptTypeName(
  f,
  TypeVariableName(

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/PropertyAnnotator.kt

@@ -137,7 +137,7 @@ private constructor(
  }
 
  private fun name(f: StandardField) = when (f.type) {
- FieldType.ENUM -> f.typePClass.renderName(ctx.pkg)
+ FieldType.ENUM -> f.typePClass.qualifiedName
  else -> ""
  }
 

protokt-codegen/src/test/kotlin/com/toasttab/protokt/MainTest.kt

@@ -44,7 +44,7 @@ class MainTest {
  "--plugin=protoc-gen-custom=$binGenerator",
  "--custom_out=.", // ignored
  "-I$codegenTestingProto",
- "-I$runtimeResources",
+ "-I$extensionsProto",
  "-I$includeProtos",
  buildPluginOptions(ext),
  "$testProto"
@@ -90,8 +90,8 @@ private val codegenTestingProto =
 private val testProto =
  File(codegenTestingProto.toFile(), "test.proto")
 
-private val runtimeResources =
- Path.of("protokt-runtime", "src", "main", "resources")
+private val extensionsProto =
+ Path.of("extensions", "protokt-extensions-lite", "src", "main", "proto")
 
 private val generatedFile =
  File(

protokt-core-lite/build.gradle.kts

@@ -13,11 +13,12 @@
  * limitations under the License.
  */
 
-import com.google.protobuf.gradle.proto
 import com.google.protobuf.gradle.protobuf
 import com.toasttab.protokt.gradle.protokt
 
-apply(plugin = "kotlin-kapt")
+plugins {
+ kotlin("kapt")
+}
 
 localProtokt()
 pureKotlin()
@@ -38,13 +39,5 @@ dependencies {
 
  implementation(libraries.autoServiceAnnotations)
 
- add("kapt", libraries.autoService)
-}
-
-sourceSets {
- main {
- proto {
- srcDir("../protokt-runtime/src/main/resources")
- }
- }
+ kapt(libraries.autoService)
 }

settings.gradle.kts

@@ -45,8 +45,8 @@ include(
  "extensions",
  "extensions:protokt-extensions-api",
  "extensions:protokt-extensions-simple",
- "extensions:protokt-extensions-proto-based",
- "extensions:publish",
+ "extensions:protokt-extensions",
+ "extensions:protokt-extensions-lite",
 
  "testing:android",
  "testing:android-test-configurations",

testing/options-test-configurations/build.gradle.kts

@@ -21,7 +21,7 @@ pureKotlin()
 
 dependencies {
  testProtoktExtensions(project(":testing:options-api"))
- testProtoktExtensions(project(":extensions:publish"))
+ testProtoktExtensions(project(":extensions:protokt-extensions"))
 
  testProtobuf(project(":testing:options"))
 }

testing/options/build.gradle.kts

@@ -25,7 +25,7 @@ protokt {
 
 dependencies {
  protoktExtensions(project(":testing:options-api"))
- protoktExtensions(project(":extensions:publish"))
+ protoktExtensions(project(":extensions:protokt-extensions"))
 
  implementation(libraries.grpcStub)
 

testing/plugin-options/lite/build.gradle.kts

@@ -14,6 +14,7 @@
  */
 
 import com.toasttab.protokt.gradle.protokt
+import com.toasttab.protokt.gradle.protoktExtensions
 
 localProtokt()
 pureKotlin()
@@ -23,5 +24,6 @@ protokt {
 }
 
 dependencies {
+ protoktExtensions(project(":extensions:protokt-extensions-lite"))
  testImplementation(kotlin("reflect"))
 }

testing/plugin-options/lite/src/test/kotlin/com/toasttab/protokt/testing/pluginoptions/LiteOptionTest.kt

@@ -15,12 +15,8 @@
 
 package com.toasttab.protokt.testing.pluginoptions
 
-import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
-import toasttab.protokt.testing.lite.LiteEnum
-import toasttab.protokt.testing.lite.LiteMessage
-import kotlin.reflect.full.declaredMemberProperties
 
 class LiteOptionTest {
  @Test
@@ -31,23 +27,16 @@ class LiteOptionTest {
  }
 
  @Test
- fun `enum has no descriptor reference`() {
- assertThat(
- LiteEnum.Deserializer::class.declaredMemberProperties.map { it.name }
- ).doesNotContain("descriptor")
- }
-
- @Test
- fun `message has no descriptor reference`() {
- assertThat(
- LiteMessage.Deserializer::class.declaredMemberProperties.map { it.name }
- ).doesNotContain("descriptor")
+ fun `service descriptor doesn't exist`() {
+ assertThrows<ClassNotFoundException> {
+ Class.forName("toasttab.protokt.testing.lite.LiteService")
+ }
  }
 
  @Test
- fun `service descriptor doesn't exist`() {
+ fun `protokt descriptor isn't available`() {
  assertThrows<ClassNotFoundException> {
- Class.forName("toasttab.protokt.testing.lite.LiteService")
+ Class.forName("com.toasttab.protokt.ext.Protokt")
  }
  }
 }

testing/plugin-options/lite/src/test/proto/toasttab/protokt/testing/lite/lite_test.proto

@@ -18,6 +18,8 @@ syntax = "proto3";
 package toasttab.protokt.testing.lite;
 
 import "google/protobuf/wrappers.proto";
+import "protokt/ext/inet_socket_address.proto";
+import "protokt/protokt.proto";
 
 message LiteMessage {}
 
@@ -37,4 +39,6 @@ message WellKnownTypesLite {
  google.protobuf.BoolValue bool = 7;
  google.protobuf.StringValue string = 8;
  google.protobuf.BytesValue bytes = 9;
+
+ .protokt.ext.InetSocketAddress address = 10 [(.protokt.property).wrap = "java.net.InetSocketAddress"];
 }