Test for new plugin behavior - transitive deps for free

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ jimfs = "1.0"
 jmh = "1.34"
 jsr305 = "3.0.2"
 junit = "4.13.2"
-kotlin = "1.6.10"
+kotlin = "1.6.21"
 kotlinpoet = "1.12.0"
 ktlint = "0.42.1"
 moshi = "1.13.0"

wire-library/wire-gradle-plugin/src/test/kotlin/com/squareup/wire/gradle/WirePluginTest.kt

@@ -4,6 +4,11 @@ package com.squareup.wire.gradle
 
 import com.squareup.wire.VERSION
 import com.squareup.wire.testing.withPlatformSlashes
+import java.io.File
+import java.io.IOException
+import java.util.zip.ZipFile
+import kotlin.text.RegexOption.DOT_MATCHES_ALL
+import kotlin.text.RegexOption.MULTILINE
 import org.assertj.core.api.Assertions.assertThat
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
@@ -14,11 +19,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
-import java.io.File
-import java.io.IOException
-import java.util.zip.ZipFile
-import kotlin.text.RegexOption.DOT_MATCHES_ALL
-import kotlin.text.RegexOption.MULTILINE
 
 class WirePluginTest {
 
@@ -34,14 +34,14 @@ class WirePluginTest {
       .withPluginClasspath()
       // Ensure individual tests are isolated and not reusing each other's previous outputs
       // by setting project dir and gradle home directly.
-      .withProjectDir(tmpFolder.newFolder("project-dir"))
+//      .withProjectDir(tmpFolder.newFolder("project-dir"))
       .withArguments(
         "-g",
         tmpFolder.newFolder("gradle-home").absolutePath,
         "generateProtos",
         "--stacktrace",
         "--info",
-        "--configuration-cache",
+//        "--configuration-cache",
       )
       .withDebug(true)
   }
@@ -1307,6 +1307,41 @@ class WirePluginTest {
     buildCacheDir.deleteRecursively()
   }
 
+  /**
+   * This project has a protoSource .jar
+   *   caveman.jar
+   *
+   * It depends on another .jar,
+   *   all-protos.jar
+   *
+   * We expect sources to be generated from cavemen.jar, but not all-protos.jar.
+   */
+  @Test
+  fun sourcePathTransitiveDependenciesPulledAsProtoPathDependencies() {
+    val fixtureRoot = File("src/test/projects/sourcepath-dependencies-not-generated")
+
+    val result = gradleRunner.runFixture(fixtureRoot) { build() }
+
+    assertThat(result.task(":generateProtos")).isNotNull
+    assertThat(result.output)
+      .contains("Writing com.squareup.caveman.Caveman")
+      .doesNotContain("Writing com.squareup.dinosaurs.Dinosaur")
+      .doesNotContain("Writing com.squareup.geology.Period")
+
+    assertThat(
+      File(
+        fixtureRoot,
+        "dinosaurs/build/generated/source/wire/com/squareup/caveman/Caveman.java"
+      )
+    ).exists()
+    assertThat(
+      File(
+        fixtureRoot,
+        "dinosaurs/build/generated/source/wire/com/squareup/dinosaurs/Dinosaur.java"
+      )
+    ).doesNotExist()
+  }
+
   private fun GradleRunner.runFixture(
     root: File,
     action: GradleRunner.() -> BuildResult

wire-library/wire-gradle-plugin/src/test/libs/com/squareup/wire/dinosaur/caveman/1.0/caveman-1.0.pom

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.squareup.wire.dinosaur</groupId>
+  <artifactId>caveman</artifactId>
+  <version>1.0</version>
+  <description>POM was created from install:install-file</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.squareup.wire.dinosaur</groupId>
+      <artifactId>all-protos</artifactId>
+      <version>1.0</version>
+    </dependency>
+  </dependencies>
+
+</project>

wire-library/wire-gradle-plugin/src/test/libs/com/squareup/wire/dinosaur/caveman/maven-metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.squareup.wire.dinosaur</groupId>
+  <artifactId>caveman</artifactId>
+  <versioning>
+    <release>1.0</release>
+    <versions>
+      <version>1.0</version>
+    </versions>
+    <lastUpdated>20220729023530</lastUpdated>
+  </versioning>
+</metadata>

wire-library/wire-gradle-plugin/src/test/projects/sourcepath-dependencies-not-generated/build.gradle

@@ -0,0 +1,25 @@
+plugins {
+  id 'application'
+  id 'com.squareup.wire'
+}
+
+// See installProtoJars task in wire-gradle-plugin/build.gradle.kts
+repositories {
+  maven {
+    url "file://${projectDir.absolutePath}/../../../../../build/localMaven"
+  }
+}
+
+wire {
+  sourcePath {
+    srcJar 'com.squareup.wire.dinosaur:caveman:+'
+  }
+
+  // TODO(jwilson/enelson): make this dependency free by making the Gradle plugin smarter.
+  //  protoPath {
+  //    srcJar 'com.squareup.wire.dinosaur:all-protos:+'
+  //  }
+
+  java {
+  }
+}