Start running shared tests

There is a problem with our source sets that
has prevented these tests from running.

Author: swankjesse

gen-tests.gradle.kts

@@ -673,34 +673,11 @@ val generateSharedJsonCompactJavaTests by tasks.creating(JavaExec::class) {
   )
 }
 
-val generateSharedJsonKotlinTests by tasks.creating(JavaExec::class) {
-  group = "Generate Shared JSON Tests"
-  description = "Generates Kotlin classes for shared JSON tests"
-  classpath = wire
-  mainClass.set("com.squareup.wire.WireCompiler")
-  args = listOf(
-          "--proto_path=wire-tests/src/commonTest/shared/proto/proto2",
-          "--proto_path=wire-tests/src/commonTest/shared/proto/proto3",
-          "--kotlin_out=wire-tests/src/jvmJsonKotlinTest/proto-kotlin",
-          "--java_interop",
-          "all32.proto",
-          "all64.proto",
-          "all_types_proto2.proto",
-          "all_types_proto3_test_proto3_optional.proto",
-          "all_structs.proto",
-          "all_wrappers.proto",
-          "camel_case.proto",
-          "map_types.proto",
-          "pizza.proto"
-  )
-}
-
 val generateSharedJson by tasks.creating {
   group = "Generate Tests"
   description = "Generates Java and Kotlin classes for shared JSON tests"
   dependsOn(
     generateSharedJsonCompactJavaTests,
-    generateSharedJsonKotlinTests
   )
 }
 
@@ -757,6 +734,5 @@ val cleanGeneratedTests by tasks.creating(Delete::class) {
     "wire-tests/src/jvmKotlinInteropTest/proto-kotlin",
     "wire-tests/src/jvmKotlinProtoReader32Test/proto-kotlin",
     "wire-tests/src/jvmJsonJavaTest/proto-java",
-    "wire-tests/src/jvmJsonKotlinTest/proto-kotlin"
   )
 }

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 android = "4.1.1.4"
-androidGradlePlugin = "8.13.1"
+androidGradlePlugin = "8.12.0"
 asm = "9.9"
 checkerQual = "3.52.0"
 coroutines = "1.10.2"

settings.gradle.kts

@@ -60,6 +60,7 @@ include(":wire-schema-tests")
 include(":wire-swift-generator")
 include(":wire-test-utils")
 include(":wire-tests")
+include(":wire-tests-2:jvm-json-kotlin")
 if (startParameter.projectProperties.get("swift") != "false") {
   include(":wire-runtime-swift")
   include(":wire-tests-swift")

wire-tests-2/jvm-json-kotlin/build.gradle.kts

@@ -0,0 +1,48 @@
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.implementation
+import org.gradle.kotlin.dsl.kotlin
+
+plugins {
+  kotlin("jvm")
+  id("com.squareup.wire")
+}
+
+dependencies {
+  implementation(libs.assertk)
+  implementation(libs.jimfs)
+  implementation(libs.kotlin.test.junit)
+  implementation(libs.truth)
+  implementation(projects.wireGsonSupport)
+  implementation(projects.wireMoshiAdapter)
+  implementation(projects.wireRuntime)
+  implementation(projects.wireTestUtils)
+}
+
+kotlin {
+  sourceSets {
+    val test by getting {
+      kotlin.srcDir("../wire-json-shared-kotlin-tests")
+    }
+  }
+}
+
+wire {
+  sourcePath {
+    srcDir("../../wire-tests/src/commonTest/shared/proto/proto2")
+    srcDir("../../wire-tests/src/commonTest/shared/proto/proto3")
+    include(
+      "all32.proto",
+      "all64.proto",
+      "all_types_proto2.proto",
+      "all_types_proto3_test_proto3_optional.proto",
+      "all_structs.proto",
+      "all_wrappers.proto",
+      "camel_case.proto",
+      "map_types.proto",
+      "pizza.proto",
+    )
+  }
+  kotlin {
+    javaInterop = true
+  }
+}

…kotlin/com/squareup/wire/WireJsonTest.kt …-tests/com/squareup/wire/WireJsonTest.ktwire-tests/src/jvmJsonTest/kotlin/com/squareup/wire/WireJsonTest.kt renamed to wire-tests-2/wire-json-shared-kotlin-tests/com/squareup/wire/WireJsonTest.kt wire-tests/src/jvmJsonTest/kotlin/com/squareup/wire/WireJsonTest.kt renamed to wire-tests-2/wire-json-shared-kotlin-tests/com/squareup/wire/WireJsonTest.kt

@@ -1245,7 +1245,7 @@ class WireJsonTest {
     )
 
     private fun loadJson(fileName: String): String {
-      return File("src/commonTest/shared/json", fileName).source().use { it.buffer().readUtf8() }
+      return File("../../wire-tests/src/commonTest/shared/json", fileName).source().use { it.buffer().readUtf8() }
     }
   }
 }

…re/internal/DurationJsonFormatterTest.kt …re/internal/DurationJsonFormatterTest.ktwire-tests/src/jvmJsonTest/kotlin/com/squareup/wire/internal/DurationJsonFormatterTest.kt renamed to wire-tests-2/wire-json-shared-kotlin-tests/com/squareup/wire/internal/DurationJsonFormatterTest.kt wire-tests/src/jvmJsonTest/kotlin/com/squareup/wire/internal/DurationJsonFormatterTest.kt renamed to wire-tests-2/wire-json-shared-kotlin-tests/com/squareup/wire/internal/DurationJsonFormatterTest.kt

@@ -163,19 +163,6 @@ wireBuild {
     implementation(projects.wireRuntime)
     implementation(projects.wireTestUtils)
   }
-
-  createJavaTestTask("jvmJsonKotlinTest") {
-    sourceSet.java.srcDir("src/jvmJsonTest/kotlin")
-    sourceSet.java.srcDir("src/jvmJsonKotlinTest/proto-kotlin")
-    implementation(libs.assertk)
-    implementation(libs.jimfs)
-    implementation(libs.kotlin.test.junit)
-    implementation(libs.truth)
-    implementation(projects.wireGsonSupport)
-    implementation(projects.wireMoshiAdapter)
-    implementation(projects.wireRuntime)
-    implementation(projects.wireTestUtils)
-  }
 }
 
 configure<SpotlessExtension> {
@@ -193,7 +180,6 @@ configure<SpotlessExtension> {
       "src/jvmKotlinInteropTest/proto-kotlin/**/*.kt",
       "src/jvmKotlinProtoReader32Test/proto-kotlin/**/*.kt",
       "src/jvmJsonJavaTest/proto-java/**/*.kt",
-      "src/jvmJsonKotlinTest/proto-kotlin/**/*.kt",
     )
   }
   java {