Merge pull request #3122 from square/bquenaudon.2024-09-25.importfix

Use proper type for project dependencies
square · Sep 26, 2024 · 706a8f1 · 706a8f1
2 parents fca72a3 + 0093186
commit 706a8f1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: Check test files
         run: |
-          ./gradlew generateTests --stacktrace --warning-mode all
+          ./gradlew generateTests -Pswift=false --stacktrace --warning-mode all
           if [ ! -z "$(git status --porcelain)" ]; then git diff; echo -e "\nTest files changed. Did you run ./gradlew generateTests?"; exit 1; fi
 
       - name: Test Native and JS

diff --git a/gen-tests.gradle.kts b/gen-tests.gradle.kts
@@ -522,12 +522,14 @@ val generateSwiftProto2Tests by tasks.creating(JavaExec::class) {
 val generateSwiftTests by tasks.creating {
   group = "Generate Tests"
   description = "Generates Swift classes from the test protos"
-  dependsOn(
-    generateSwiftProto2ManifestTests,
-    generateSwiftProto2Tests,
-    generateSwiftProto3Tests,
-    ":wire-runtime-swift:generateTestProtos"
-  )
+  if (project.properties.get("swift") != "false") {
+    dependsOn(
+      generateSwiftProto2ManifestTests,
+      generateSwiftProto2Tests,
+      generateSwiftProto3Tests,
+      ":wire-runtime-swift:generateTestProtos"
+    )
+  }
 }
 
 // GRPC

diff --git a/wire-gradle-plugin/api/wire-gradle-plugin.api b/wire-gradle-plugin/api/wire-gradle-plugin.api
@@ -146,6 +146,7 @@ public final class com/squareup/wire/gradle/WireExtension$ProtoRootSet {
 	public final fun srcJar (Lorg/gradle/api/provider/Provider;)V
 	public final fun srcJar (Lorg/gradle/api/provider/ProviderConvertible;)V
 	public final fun srcProject (Ljava/lang/String;)V
+	public final fun srcProject (Lorg/gradle/api/artifacts/ProjectDependency;)V
 	public final fun srcProject (Lorg/gradle/api/internal/catalog/DelegatingProjectDependency;)V
 }
 

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
@@ -21,6 +21,7 @@ import kotlin.LazyThreadSafetyMode.NONE
 import org.gradle.api.Action
 import org.gradle.api.Project
 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
@@ -351,10 +352,16 @@ open class WireExtension(
     }
 
     /** Sets a project. */
+    @Deprecated("Use srcProject(ProjectDependency) instead. This method will be removed in a future version of Wire.")
     fun srcProject(project: DelegatingProjectDependency) {
       addDependency(project)
     }
 
+    /** Sets a project. */
+    fun srcProject(project: ProjectDependency) {
+      addDependency(project)
+    }
+
     private fun addDependency(dependencyNotation: Any) {
       isEmpty = false
       project.dependencies.add(configuration.name, dependencyNotation)