implement a converter to dynamic message

buildSrc/src/main/kotlin/LocalProtoktBuild.kt

@@ -25,8 +25,8 @@ import protokt.v1.gradle.CODEGEN_NAME
 import protokt.v1.gradle.configureProtokt
 import java.io.File
 
-fun Project.localProtokt() {
- configureProtokt(this, null) {
+fun Project.localProtokt(disableJava: Boolean = true) {
+ configureProtokt(this, null, disableJava) {
  "$rootDir/protokt-codegen/build/install/$CODEGEN_NAME/bin/$CODEGEN_NAME"
  }
 

buildSrc/src/main/kotlin/protokt/v1/gradle/ProtobufBuild.kt

@@ -33,6 +33,7 @@ import java.net.URLEncoder
 internal fun configureProtobufPlugin(
  project: Project,
  ext: ProtoktExtension,
+ disableJava: Boolean,
  binaryPath: String
 ) {
  project.apply<ProtobufPlugin>()
@@ -52,8 +53,10 @@ internal fun configureProtobufPlugin(
 
  generateProtoTasks {
  for (task in all()) {
- task.builtins {
- findByName("java")?.run(::remove)
+ if (disableJava) {
+ task.builtins {
+ findByName("java")?.run(::remove)
+ }
  }
 
  task.plugins {

buildSrc/src/main/kotlin/protokt/v1/gradle/ProtoktBuild.kt

@@ -48,10 +48,15 @@ const val EXTENSIONS = "protoktExtensions"
 
 const val TEST_EXTENSIONS = "testProtoktExtensions"
 
-fun configureProtokt(project: Project, protoktVersion: Any?, resolveBinary: () -> String) {
+fun configureProtokt(
+ project: Project,
+ protoktVersion: Any?,
+ disableJava: Boolean = true,
+ resolveBinary: () -> String
+) {
  injectKotlinPluginsIntoProtobufGradle()
  val ext = project.extensions.create<ProtoktExtension>("protokt")
- configureProtobufPlugin(project, ext, resolveBinary())
+ configureProtobufPlugin(project, ext, disableJava, resolveBinary())
 
  project.createExtensionConfigurationsAndConfigureProtobuf()
 

gradle/libs.versions.toml

@@ -13,8 +13,10 @@
 
 [versions]
 autoService = "1.0.1"
+classgraph = "4.8.153"
 grpc-java = "1.58.0"
 grpc-kotlin = "1.4.0"
+guava = "33.0.0-android"
 kotlinLogging = "5.1.0"
 kotlinPoet = "1.14.2"
 kotlinx-coroutines = "1.6.0"
@@ -60,9 +62,11 @@ wire = { id = "com.squareup.wire", version.ref = "wire" }
 [libraries]
 autoService = { module = "com.google.auto.service:auto-service", version.ref = "autoService" }
 autoServiceAnnotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoService" }
+classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classgraph" }
 grpc-kotlin-gen = { module = "io.grpc:protoc-gen-grpc-kotlin", version.ref = "grpc-kotlin" }
 grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc-java" }
 grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc-java" }
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
 kotlinLogging = { module = "io.github.oshai:kotlin-logging", version.ref = "kotlinLogging" }
 kotlinPoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinPoet" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }

protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/CodeGenerator.kt

@@ -35,11 +35,7 @@ object CodeGenerator {
 
  fun generate(contents: ProtoFileContents) =
  contents.types.flatMap {
- generate(
- it,
- Context(emptyList(), contents.info)
- )
- .map { type -> GeneratedType(it, type) }
+ generate(it, Context(emptyList(), contents.info)).map(::GeneratedType)
  }
 
  fun generate(type: TopLevelType, ctx: Context): Iterable<TypeSpec> =

protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/DeserializerGenerator.kt

@@ -83,7 +83,7 @@ private class DeserializerGenerator(
  beginControlFlow("when (deserializer.readTag())")
  val constructor =
  buildCodeBlock {
- add("0·->·return·%T(\n", msg.className)
+ add("0u·->·return·%T(\n", msg.className)
  withIndent {
  constructorLines(properties).forEach(::add)
  }
@@ -92,7 +92,7 @@ private class DeserializerGenerator(
  addStatement("%L", constructor)
  deserializerInfo.forEach {
  addStatement(
- "%L -> %N = %L",
+ "%Lu -> %N = %L",
  it.tag,
  it.fieldName,
  it.value
@@ -156,7 +156,7 @@ private class DeserializerGenerator(
  CodeBlock.of("%T.from(unknownFields)", UnknownFieldSet::class)
 
  private class DeserializerInfo(
- val tag: Int,
+ val tag: UInt,
  val fieldName: String,
  val value: CodeBlock
  )

protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/MapEntryGenerator.kt

@@ -135,11 +135,11 @@ private class MapEntryGenerator(
  beginControlFlow("when (deserializer.readTag())")
  addStatement("%L", constructOnZero(value))
  addStatement(
- "${key.tag.value} -> key = %L",
+ "${key.tag.value}u -> key = %L",
  deserialize(key, ctx)
  )
  addStatement(
- "${value.tag.value} -> value = %L",
+ "${value.tag.value}u -> value = %L",
  deserialize(value, ctx)
  )
  endControlFlow()
@@ -170,7 +170,7 @@ private class MapEntryGenerator(
 
  private fun constructOnZero(f: StandardField) =
  buildCodeBlock {
- add("0 -> return %T(key, value", msg.className)
+ add("0u -> return %T(key, value", msg.className)
  if (f.type == FieldType.Message) {
  add(" ?: %T{}", value.className)
  }

protokt-codegen/src/main/kotlin/protokt/v1/codegen/util/Types.kt

@@ -166,11 +166,10 @@ class ProtoFileContents(
 )
 
 class GeneratedType(
- val rawType: TopLevelType,
  val typeSpec: TypeSpec
 )
 
-sealed class Tag(val value: Int) : Comparable<Tag> {
+sealed class Tag(val value: UInt) : Comparable<Tag> {
  class Packed(
  number: Int
  ) : Tag(computeTag(number, 2))
@@ -188,4 +187,4 @@ sealed class Tag(val value: Int) : Comparable<Tag> {
 }
 
 private fun computeTag(fieldNumber: Int, wireType: Int) =
- (fieldNumber shl 3) or wireType
+ (fieldNumber shl 3).toUInt() or wireType.toUInt()

protokt-core/src/jvmMain/kotlin/protokt/v1/google/protobuf/AnyUtil.kt

@@ -49,17 +49,13 @@ inline fun <reified T : KtMessage> Any.unpack(deserializer: KtDeserializer<T>):
  return deserializer.deserialize(value)
 }
 
-@Suppress("DEPRECATION")
 inline fun <reified T : KtMessage> Any.isA() =
  typeUrl.substringAfterLast('/') ==
  (
  T::class.java.getAnnotation(KtGeneratedMessage::class.java)?.fullTypeName
- ?: T::class.java.getAnnotation(com.toasttab.protokt.rt.KtGeneratedMessage::class.java)?.fullTypeName
  ?: error("class ${T::class} has no protokt generated message annotation")
  )
 
-@Suppress("DEPRECATION")
 private fun fullTypeName(klass: KClass<*>) =
  klass.java.getAnnotation(KtGeneratedMessage::class.java)?.fullTypeName
- ?: klass.java.getAnnotation(com.toasttab.protokt.rt.KtGeneratedMessage::class.java)?.fullTypeName
  ?: error("class $klass has no protokt generated message annotation")

protokt-reflect/build.gradle.kts

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2023 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:https://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.
+ */
+
+import com.google.protobuf.gradle.proto
+
+/*
+ * Copyright (c) 2023 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:https://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.
+ */
+
+plugins {
+ id("protokt.multiplatform-conventions")
+}
+
+localProtokt(false)
+enablePublishing()
+compatibleWithAndroid()
+trackKotlinApiCompatibility()
+
+kotlin {
+ sourceSets {
+ val jvmMain by getting {
+ dependencies {
+ api(project(":protokt-core"))
+ api(libs.protobuf.java)
+
+ implementation(kotlin("reflect"))
+ implementation(libs.guava)
+ implementation(libs.classgraph)
+ }
+ }
+ }
+}
+
+tasks.withType<JavaCompile> { enabled = true }
+
+sourceSets {
+ main {
+ proto {
+ srcDir("../extensions/protokt-extensions-lite/src/main/proto")
+ }
+ }
+}