Merge pull request #2525 from square/bquenaudon.2023-07-07.mpp

WireSchemaTests as MPP module

wire-grpc-server-generator/src/test/java/com/squareup/wire/kotlin/grpcserver/GoldenTestUtils.kt

@@ -16,7 +16,6 @@
 package com.squareup.wire.kotlin.grpcserver
 
 import com.squareup.kotlinpoet.FileSpec
-import com.squareup.wire.WireCompiler
 import java.io.File
 import okio.buffer
 import okio.source
@@ -25,7 +24,7 @@ import org.assertj.core.api.Assertions
 object GoldenTestUtils {
   fun assertFileEquals(expectedFileName: String, spec: FileSpec) {
     val finalSpec = spec.toBuilder()
-      .addFileComment(WireCompiler.CODE_GENERATED_BY_WIRE)
+      .addFileComment("Code generated by Wire protocol buffer compiler, do not edit.")
       .build()
 
     val expected = File("src/test/golden/$expectedFileName").source().buffer().readUtf8()

wire-runtime/build.gradle.kts

@@ -2,7 +2,6 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka
 import com.vanniktech.maven.publish.KotlinMultiplatform
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
-// apply(plugin = "org.jetbrains.kotlin.multiplatform")
 plugins {
   kotlin("multiplatform")
   id("com.github.gmazzo.buildconfig")

wire-schema-tests/api/wire-schema-tests.api

@@ -2,7 +2,6 @@ public final class com/squareup/wire/SchemaBuilder {
 	public fun <init> ()V
 	public final fun add (Lokio/Path;Ljava/lang/String;)Lcom/squareup/wire/SchemaBuilder;
 	public final fun add (Lokio/Path;Ljava/lang/String;Lokio/Path;)Lcom/squareup/wire/SchemaBuilder;
-	public static synthetic fun add$default (Lcom/squareup/wire/SchemaBuilder;Lokio/Path;Ljava/lang/String;Lokio/Path;ILjava/lang/Object;)Lcom/squareup/wire/SchemaBuilder;
 	public final fun addProtoPath (Lokio/Path;Ljava/lang/String;)Lcom/squareup/wire/SchemaBuilder;
 	public final fun build ()Lcom/squareup/wire/schema/Schema;
 }

wire-schema-tests/build.gradle.kts

@@ -2,10 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka
 import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 
-// TODO(Benoit) this module can be multiplatform.
-
 plugins {
-  kotlin("jvm")
+  kotlin("multiplatform")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base").apply(false)
 }
@@ -15,21 +13,57 @@ if (project.rootProject.name == "wire") {
   apply(plugin = "binary-compatibility-validator")
 }
 
-dependencies {
-  api(libs.junit)
-  api(projects.wireCompiler)
-  api(projects.wireSchema)
-  implementation(projects.wireKotlinGenerator)
-  implementation(projects.wireJavaGenerator)
-  implementation(projects.wireSwiftGenerator)
-  implementation(libs.okio.core)
-  implementation(libs.okio.fakefilesystem)
-  testImplementation(libs.assertj)
-  testImplementation(libs.kotlin.test.junit)
-  testImplementation(projects.wireTestUtils)
+kotlin {
+  jvm {
+    // Required by MavenPublishBaseExtension even though we do not have Java sources.
+    withJava()
+  }
+  if (System.getProperty("kjs", "true").toBoolean()) {
+    js(IR) {
+      configure(listOf(compilations.getByName("main"), compilations.getByName("test"))) {
+        tasks.getByName(compileKotlinTaskName) {
+          kotlinOptions {
+            moduleKind = "umd"
+            sourceMap = true
+            metaInfo = true
+          }
+        }
+      }
+      nodejs()
+      browser()
+    }
+  }
+  sourceSets {
+    val commonMain by getting {
+      dependencies {
+        api(libs.okio.core)
+        api(projects.wireSchema)
+        implementation(libs.okio.fakefilesystem)
+      }
+    }
+    val commonTest by getting {
+      dependencies {
+        implementation(libs.kotlin.test.common)
+        implementation(libs.kotlin.test.annotations)
+      }
+    }
+    val jvmTest by getting {
+      dependencies {
+        implementation(libs.assertj)
+        implementation(libs.kotlin.test.junit)
+        implementation(projects.wireTestUtils)
+      }
+    }
+    if (System.getProperty("kjs", "true").toBoolean()) {
+      val jsTest by getting {
+        dependencies {
+          implementation(libs.kotlin.test.js)
+        }
+      }
+    }
+  }
 }
 
-
 if (project.rootProject.name == "wire") {
   configure<MavenPublishBaseExtension> {
     configure(

wire-schema-tests/src/main/java/com/squareup/wire/SchemaBuilder.kt → wire-schema-tests/src/commonMain/kotlin/com/squareup/wire/SchemaBuilder.kt

@@ -41,8 +41,18 @@ class SchemaBuilder {
    * @param name The qualified name of the file.
    * @param protoFile The content of the file.
    */
-  @JvmOverloads
-  fun add(name: Path, protoFile: String, path: Path = sourcePath): SchemaBuilder {
+  fun add(name: Path, protoFile: String): SchemaBuilder {
+    return add(name, protoFile, sourcePath)
+  }
+
+  /**
+   * Add a file to be loaded into the schema.
+   *
+   * @param name The qualified name of the file.
+   * @param protoFile The content of the file.
+   * @param path The path on which [name] is based.
+   */
+  fun add(name: Path, protoFile: String, path: Path): SchemaBuilder {
     require(name.toString().endsWith(".proto")) {
       "unexpected file extension for $name. Proto files should use the '.proto' extension"
     }

wire-schema-tests/src/test/java/com/squareup/wire/SchemaBuilderTest.kt → wire-schema-tests/src/jvmTest/kotlin/com/squareup/wire/SchemaBuilderTest.kt

@@ -19,7 +19,7 @@ import com.squareup.wire.schema.Location
 import com.squareup.wire.schema.SchemaException
 import okio.Path.Companion.toPath
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import kotlin.test.Test
 import kotlin.test.assertFailsWith
 
 class SchemaBuilderTest {

wire-schema/build.gradle.kts

@@ -32,13 +32,14 @@ kotlin {
       browser()
     }
   }
-
   sourceSets {
     val commonMain by getting {
       dependencies {
         api(projects.wireRuntime)
       }
     }
+    val commonTest by getting {
+    }
     val jvmMain by getting {
       dependencies {
         api(libs.okio.core)
@@ -69,7 +70,6 @@ kotlin {
   }
 }
 
-
 if (project.rootProject.name == "wire") {
   configure<MavenPublishBaseExtension> {
     configure(