Don't use FileOrUriNotationConverter (#3288)

* Don't use FileOrUriNotationConverter It's an internal API in Gradle. * Fix non-empty check * Fixup failing test --------- Co-authored-by: Jesse Wilson <[email protected]>
square · Feb 12, 2025 · 8dddcef · 8dddcef
1 parent 7d3be25
commit 8dddcef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 28 deletions.
diff --git a/wire-gradle-plugin/src/main/kotlin/com/squareup/wire/gradle/WireExtension.kt b/wire-gradle-plugin/src/main/kotlin/com/squareup/wire/gradle/WireExtension.kt
@@ -24,7 +24,6 @@ import org.gradle.api.artifacts.MinimalExternalModuleDependency
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.internal.catalog.DelegatingProjectDependency
-import org.gradle.api.internal.file.FileOrUriNotationConverter
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderConvertible
 
@@ -299,11 +298,10 @@ open class WireExtension(
         isCanBeConsumed = false
         isTransitive = false
       }
-    internal val sourceDirectoriesAndLocalJars = mutableListOf<File>()
 
     /** Calling this will resolve the configuration. */
     internal val roots: Set<File>
-      get() = configuration.files + sourceDirectoriesAndLocalJars
+      get() = configuration.files
     private val files: ConfigurableFileCollection by lazy(NONE) {
       val files = project.files()
       project.dependencies.add(configuration.name, files)
@@ -333,16 +331,17 @@ open class WireExtension(
 
     /** Sets a local or a remote jar. Examples: "libs/protos.jar", or "com.example:protos:1.0.0". */
     fun srcJar(jar: String) {
-      srcFileOrConfiguration(jar)
-    }
+      // Attempt to parse 'jar' as a path or 'file:' URI.
+      val fileOrNull = try {
+        project.file(jar)
+      } catch (e: Exception) {
+        null // Probably a dependency string like "com.example:protos:1.0.0".
+      }
 
-    private fun srcFileOrConfiguration(jar: String) {
-      isEmpty = false
-      val parser = FileOrUriNotationConverter.parser()
-      val converted = parser.parseNotation(jar)
-      when (converted) {
-        is File -> sourceDirectoriesAndLocalJars += project.file(jar)
-        else -> addDependency(jar)
+      if (fileOrNull != null) {
+        addDependency(project.files(fileOrNull))
+      } else {
+        addDependency(jar)
       }
     }
 

diff --git a/wire-gradle-plugin/src/main/kotlin/com/squareup/wire/gradle/WirePlugin.kt b/wire-gradle-plugin/src/main/kotlin/com/squareup/wire/gradle/WirePlugin.kt
@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:OptIn(ExperimentalStdlibApi::class)
-
 package com.squareup.wire.gradle
 
 import com.squareup.wire.VERSION
@@ -31,7 +29,6 @@ import java.util.concurrent.atomic.AtomicBoolean
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.UnknownConfigurationException
-import org.gradle.api.internal.file.FileOrUriNotationConverter
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.api.tasks.compile.JavaCompile
@@ -195,20 +192,15 @@ class WirePlugin : Plugin<Project> {
         task.group = GROUP
         task.description = "Generate protobuf implementation for ${source.name}"
 
-        var addedSourcesDependencies = 0
         // Flatten all the input files here. Changes to any of them will cause the task to re-run.
         for (rootSet in protoSourceProtoRootSets) {
           task.source(rootSet.configuration)
-          val sourceDirectoriesAndLocalJars = rootSet.sourceDirectoriesAndLocalJars.toTypedArray()
-          addedSourcesDependencies += sourceDirectoriesAndLocalJars.size
-          task.source(*sourceDirectoriesAndLocalJars)
         }
         // We only want to add ProtoPath sources if we have other sources already. The WireTask
         // would otherwise run even through we have no sources.
-        if (addedSourcesDependencies > 0) {
+        if (!task.source.isEmpty) {
           for (rootSet in protoPathProtoRootSets) {
             task.source(rootSet.configuration)
-            task.source(*rootSet.sourceDirectoriesAndLocalJars.toTypedArray())
           }
         }
 
@@ -339,13 +331,9 @@ class WirePlugin : Plugin<Project> {
   }
 
   private fun defaultSourceFolders(source: Source): Set<String> {
-    val parser = FileOrUriNotationConverter.parser()
-    return source.sourceSets.map { "src/$it/proto" }.filter { path ->
-      val converted = parser.parseNotation(path) as File
-      val file =
-        if (!converted.isAbsolute) File(project.projectDir, converted.path) else converted
-      return@filter file.exists()
-    }.toSet()
+    return source.sourceSets.map { "src/$it/proto" }
+      .filter { path -> File(project.projectDir, path).exists() }
+      .toSet()
   }
 
   internal companion object {