Move protobufExtension to ProtobufPlugin field

google · Jul 12, 2022 · 8500641 · 8500641
1 parent fe768bf
commit 8500641
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy b/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
@@ -72,6 +72,7 @@ class ProtobufPlugin implements Plugin<Project> {
 
     private final FileResolver fileResolver
     private Project project
+    private ProtobufExtension protobufExtension
     private boolean wasApplied = false
 
     @Inject
@@ -85,7 +86,7 @@ class ProtobufPlugin implements Plugin<Project> {
           "Gradle version is ${project.gradle.gradleVersion}. Minimum supported version is 5.6")
       }
 
-      ProtobufExtension protobufExtension = project.extensions.create("protobuf", ProtobufExtension, project)
+      this.protobufExtension = project.extensions.create("protobuf", ProtobufExtension, project)
 
       this.project = project
         // At least one of the prerequisite plugins must by applied before this plugin can be applied, so
@@ -121,7 +122,7 @@ class ProtobufPlugin implements Plugin<Project> {
       task.source genProtoTask.getOutputSourceDirectorySet().include("**/*.java", "**/*.kt")
     }
 
-    private void doApply(final ProtobufExtension protobufExtension) {
+    private void doApply() {
         // Provides the osdetector extension
         project.apply([plugin:com.google.gradle.osdetector.OsDetectorPlugin])
 
@@ -248,7 +249,7 @@ class ProtobufPlugin implements Plugin<Project> {
     /**
      * Adds Protobuf-related tasks to the project.
      */
-    private void addProtoTasks(final ProtobufExtension protobufExtension) {
+    private void addProtoTasks() {
       if (Utils.isAndroidProject(project)) {
         getNonTestVariants().each { variant ->
           addTasksForVariant(protobufExtension, variant, false)
@@ -266,10 +267,7 @@ class ProtobufPlugin implements Plugin<Project> {
     /**
      * Creates Protobuf tasks for a sourceSet in a Java project.
      */
-    private void addTasksForSourceSet(
-        final ProtobufExtension protobufExtension,
-        final SourceSet sourceSet
-    ) {
+    private void addTasksForSourceSet(final SourceSet sourceSet) {
       Task generateProtoTask = addGenerateProtoTask(protobufExtension, sourceSet.name, [sourceSet])
       generateProtoTask.sourceSet = sourceSet
       generateProtoTask.doneInitializing()
@@ -293,11 +291,7 @@ class ProtobufPlugin implements Plugin<Project> {
     /**
      * Creates Protobuf tasks for a variant in an Android project.
      */
-    private void addTasksForVariant(
-        final ProtobufExtension protobufExtension,
-        final Object variant,
-        final boolean isTestVariant
-    ) {
+    private void addTasksForVariant(final Object variant, final boolean isTestVariant) {
       // GenerateProto task, one per variant (compilation unit).
       Task generateProtoTask = addGenerateProtoTask(protobufExtension, variant.name, variant.sourceSets)
       generateProtoTask.setVariant(variant, isTestVariant)

diff --git a/testProjectBase/build_base.gradle b/testProjectBase/build_base.gradle
@@ -76,11 +76,8 @@ def assertFileExists(boolean exists, String path) {
 }
 
 test.doLast {
-  assert [
-      'generateProto',
-      'generateGrpcProto',
-      'generateTestProto'
-  ] as Set == protobuf.generateProtoTasks.all().collect({ it.name }) as Set
+  assert ['generateProto', 'generateGrpcProto', 'generateTestProto'] as Set ==
+      protobuf.generateProtoTasks.all().collect({ it.name }) as Set
 
   assert ['generateProto'] as Set == protobuf.generateProtoTasks.ofSourceSet('main').collect({ it.name }) as Set
   assert [] as Set == protobuf.generateProtoTasks.ofTest().collect({ it.name }) as Set