Improve code generation in connect-kotlin (#86)

connectrpc · Sep 1, 2023 · d1cc0f8 · d1cc0f8
1 parent 70bf6a9
commit d1cc0f8
Show file tree

Hide file tree

Showing 19 changed files with 95 additions and 2,033 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,14 +3,7 @@
 !/**/src/**/build/*
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
-/examples/generated-google-java/src/main/
-/examples/generated-google-javalite/src/main/
-/crosstests/google-java/src/main/kotlin/generated/
-/crosstests/google-java/src/main/java/generated/
-/crosstests/google-javalite/src/main/kotlin/generated/
-/crosstests/google-javalite/src/main/java/generated/
 /local.properties
-/protoc-gen-connect-kotlin/src/test/java/
 /.gradle
 /.idea
 /.tmp

diff --git a/Makefile b/Makefile
@@ -34,21 +34,12 @@ buildplugin: ## Build the connect-kotlin protoc plugin.
 .PHONY: clean
 clean: ## Cleans the underlying build.
 	./gradlew $(GRADLE_ARGS) clean
-	rm -rf examples/generated-google-java/src/main
-	rm -rf examples/generated-google-javalite/src/main
-
-	rm -rf crosstests/google-java/src/main/java/generated
-	rm -rf crosstests/google-java/src/main/kotlin/generated
-	rm -rf crosstests/google-javalite/src/main/java/generated
-	rm -rf crosstests/google-javalite/src/main/kotlin/generated
-
-	rm -rf protoc-gen-connect-kotlin/src/test/java/
 
 .PHONY: crosstestsrun
 crosstestsrun: crosstestsrunjava ## Run the cross tests.
 
 .PHONY: crosstestsrunjava
-crosstestsrunjava: ## Run the cross tests for protoc-gen-java integration.
+crosstestsrunjava: generate ## Run the cross tests for protoc-gen-java integration.
 	./gradlew $(GRADLE_ARGS) crosstest:google-java:test
 
 ifeq ($(UNAME_OS),Darwin)

diff --git a/crosstests/buf.gen.yaml b/crosstests/buf.gen.yaml
@@ -4,27 +4,27 @@ managed:
 plugins:
   # Java crosstests.
   - plugin: connect-kotlin
-    out: google-java/src/main/kotlin/generated
+    out: google-java/build/generated/sources/bufgen
     path: ./protoc-gen-connect-kotlin/build/install/protoc-gen-connect-kotlin/bin/protoc-gen-connect-kotlin
     opt:
       - generateCallbackMethods=true
       - generateCoroutineMethods=true
       - generateBlockingUnaryMethods=true
   - plugin: java
-    out: google-java/src/main/java/generated
+    out: google-java/build/generated/sources/bufgen
     protoc_path: .tmp/bin/protoc
   - plugin: kotlin
-    out: google-java/src/main/kotlin/generated
+    out: google-java/build/generated/sources/bufgen
     protoc_path: .tmp/bin/protoc
   # Javalite crosstests.
   - plugin: connect-kotlin
-    out: google-javalite/src/main/kotlin/generated
+    out: google-javalite/build/generated/sources/bufgen
     path: ./protoc-gen-connect-kotlin/build/install/protoc-gen-connect-kotlin/bin/protoc-gen-connect-kotlin
   - plugin: java
-    out: google-javalite/src/main/java/generated
+    out: google-javalite/build/generated/sources/bufgen
     protoc_path: .tmp/bin/protoc
     opt: lite
   - plugin: kotlin
-    out: google-javalite/src/main/kotlin/generated
+    out: google-javalite/build/generated/sources/bufgen
     protoc_path: .tmp/bin/protoc
     opt: lite
diff --git a/crosstests/google-java/build.gradle.kts b/crosstests/google-java/build.gradle.kts
@@ -15,13 +15,14 @@ tasks {
 }
 
 sourceSets {
-    java.sourceSets["main"].java {
-        srcDir("src/main/java/generated")
+    main {
+        java {
+            srcDir("build/generated/sources/bufgen")
+        }
     }
 }
 
 dependencies {
-
     implementation(libs.kotlin.coroutines.core)
     implementation(libs.protobuf.kotlin)
     implementation(project(":crosstests:common"))
@@ -38,6 +39,6 @@ dependencies {
 
 configure<SpotlessExtension> {
     kotlin {
-        targetExclude("**/generated/**/*.kt")
+        targetExclude("build/generated/sources/bufgen/**/*.kt")
     }
 }
diff --git a/crosstests/google-javalite/build.gradle.kts b/crosstests/google-javalite/build.gradle.kts
@@ -0,0 +1,44 @@
+import com.diffplug.gradle.spotless.SpotlessExtension
+
+plugins {
+    application
+    java
+    kotlin("jvm")
+}
+
+tasks {
+    compileKotlin {
+        kotlinOptions {
+            freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+        }
+    }
+}
+
+sourceSets {
+    main {
+        java {
+            srcDir("build/generated/sources/bufgen")
+        }
+    }
+}
+
+dependencies {
+    implementation(libs.kotlin.coroutines.core)
+    implementation(libs.protobuf.kotlin)
+    implementation(project(":crosstests:common"))
+    implementation(project(":extensions:google-java"))
+    implementation(project(":okhttp"))
+
+    testImplementation(libs.okhttp.core)
+    testImplementation(libs.junit)
+    testImplementation(libs.assertj)
+    testImplementation(libs.mockito)
+    testImplementation(libs.kotlin.coroutines.core)
+    testImplementation(libs.testcontainers)
+}
+
+configure<SpotlessExtension> {
+    kotlin {
+        targetExclude("build/generated/sources/bufgen/**/*.kt")
+    }
+}
diff --git a/examples/buf.gen.yaml b/examples/buf.gen.yaml
@@ -4,15 +4,15 @@ managed:
   java_package_prefix: "build"
 plugins:
   - plugin: connect-kotlin
-    out: generated-google-java/src/main/kotlin
+    out: generated-google-java/build/generated/sources/bufgen
     path: ./protoc-gen-connect-kotlin/build/install/protoc-gen-connect-kotlin/bin/protoc-gen-connect-kotlin
   - plugin: java
-    out: generated-google-java/src/main/java
+    out: generated-google-java/build/generated/sources/bufgen
     protoc_path: .tmp/bin/protoc
   - plugin: connect-kotlin
-    out: generated-google-javalite/src/main/kotlin
+    out: generated-google-javalite/build/generated/sources/bufgen
     path: ./protoc-gen-connect-kotlin/build/install/protoc-gen-connect-kotlin/bin/protoc-gen-connect-kotlin
   - plugin: java
-    out: generated-google-javalite/src/main/java
+    out: generated-google-javalite/build/generated/sources/bufgen
     protoc_path: .tmp/bin/protoc
     opt: lite
diff --git a/examples/generated-google-java/build.gradle.kts b/examples/generated-google-java/build.gradle.kts
@@ -12,8 +12,10 @@ tasks {
 }
 
 sourceSets {
-    java.sourceSets["main"].java {
-        srcDir("src/main/java/")
+    main {
+        java {
+            srcDir("build/generated/sources/bufgen")
+        }
     }
 }
 

diff --git a/examples/generated-google-javalite/build.gradle.kts b/examples/generated-google-javalite/build.gradle.kts
@@ -12,8 +12,10 @@ tasks {
 }
 
 sourceSets {
-    java.sourceSets["main"].java {
-        srcDir("src/main/java/")
+    main {
+        java {
+            srcDir("build/generated/sources/bufgen")
+        }
     }
 }
 

diff --git a/extensions/buf.gen.yaml b/extensions/buf.gen.yaml
@@ -7,5 +7,9 @@ types:
     - google.rpc.Status
 plugins:
   - plugin: java
-    out: google-java/src/main/java
+    out: google-java/build/generated/sources/bufgen
     protoc_path: .tmp/bin/protoc
+  - plugin: java
+    out: google-javalite/build/generated/sources/bufgen
+    protoc_path: .tmp/bin/protoc
+    opt: lite
diff --git a/extensions/google-java/build.gradle.kts b/extensions/google-java/build.gradle.kts
@@ -10,8 +10,10 @@ plugins {
 }
 
 sourceSets {
-    java.sourceSets["main"].java {
-        srcDir("src/main/java/generated")
+    main {
+        java {
+            srcDir("build/generated/sources/bufgen")
+        }
     }
 }