Use new public API to create SourceDirectorySet available since Gradl…

…e 5.0 (#292) Resolves #280
google · Jan 11, 2019 · bcf3f1a · bcf3f1a
1 parent 7123080
commit bcf3f1a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 55 deletions.
diff --git a/src/main/groovy/com/google/protobuf/gradle/GenerateProtoTask.groovy b/src/main/groovy/com/google/protobuf/gradle/GenerateProtoTask.groovy
@@ -422,9 +422,15 @@ public class GenerateProtoTask extends DefaultTask {
    * directories.
    */
   SourceDirectorySet getOutputSourceDirectorySet() {
-    Preconditions.checkNotNull(fileResolver)
-    SourceDirectorySet srcSet = new DefaultSourceDirectorySet(
-        "generate-proto-" + name, this.fileResolver, new DefaultDirectoryFileTreeFactory())
+    String srcSetName = "generate-proto-" + name
+    SourceDirectorySet srcSet
+    if (Utils.compareGradleVersion(project, "5.0") < 0) {
+      Preconditions.checkNotNull(fileResolver)
+      srcSet = new DefaultSourceDirectorySet(
+          srcSetName, this.fileResolver, new DefaultDirectoryFileTreeFactory())
+    } else {
+      srcSet = project.objects.sourceDirectorySet(srcSetName, srcSetName)
+    }
     builtins.each { builtin ->
       srcSet.srcDir new File(getOutputDir(builtin))
     }

diff --git a/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy b/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
@@ -39,7 +39,9 @@ import org.gradle.api.Task
 import org.gradle.api.attributes.Attribute
 import org.gradle.api.file.FileCollection
 import org.gradle.api.file.SourceDirectorySet
+import org.gradle.api.internal.file.DefaultSourceDirectorySet
 import org.gradle.api.internal.file.FileResolver
+import org.gradle.api.internal.file.collections.DefaultDirectoryFileTreeFactory
 import org.gradle.api.logging.LogLevel
 import org.gradle.api.plugins.AppliedPlugin
 import org.gradle.api.tasks.SourceSet
@@ -177,7 +179,18 @@ class ProtobufPlugin implements Plugin<Project> {
      */
     private void addSourceSetExtensions() {
       getSourceSets().all {  sourceSet ->
-        sourceSet.extensions.create('proto', ProtobufSourceDirectorySet, sourceSet.name, fileResolver)
+        String name = sourceSet.name
+        SourceDirectorySet sds
+        if (Utils.compareGradleVersion(project, "5.0") < 0) {
+          // TODO(zhangkun83): remove dependency on Gradle internal APIs once we drop support for < 5.0
+          sds = new DefaultSourceDirectorySet(
+              name, "${name} Proto source", fileResolver, new DefaultDirectoryFileTreeFactory())
+        } else {
+          sds = project.objects.sourceDirectorySet(name, "${name} Proto source")
+        }
+        sourceSet.extensions.add('proto', sds)
+        sds.srcDir("src/${name}/proto")
+        sds.include("**/*.proto")
       }
     }
 
@@ -300,7 +313,7 @@ class ProtobufPlugin implements Plugin<Project> {
         it.fileResolver = this.fileResolver
         sourceSets.each { sourceSet ->
           addSourceFiles(sourceSet.proto)
-          ProtobufSourceDirectorySet protoSrcDirSet = sourceSet.proto
+          SourceDirectorySet protoSrcDirSet = sourceSet.proto
           protoSrcDirSet.srcDirs.each { srcDir ->
             // The source directory designated from sourceSet may not actually exist on disk.
             // "include" it only when it exists, so that Gradle and protoc won't complain
@@ -485,7 +498,7 @@ class ProtobufPlugin implements Plugin<Project> {
       } else {
         // Make the proto source dirs known to IDEs
         getSourceSets().each { sourceSet ->
-          ProtobufSourceDirectorySet protoSrcDirSet = sourceSet.proto
+          SourceDirectorySet protoSrcDirSet = sourceSet.proto
           protoSrcDirSet.srcDirs.each { File protoDir ->
             Utils.addToIdeSources(project, Utils.isTest(sourceSet.name), protoDir)
           }

diff --git a/src/main/groovy/com/google/protobuf/gradle/ProtobufSourceDirectorySet.groovy b/src/main/groovy/com/google/protobuf/gradle/ProtobufSourceDirectorySet.groovy
diff --git a/src/main/kotlin/com/google/protobuf/gradle/ProtobufConfiguratorExts.kt b/src/main/kotlin/com/google/protobuf/gradle/ProtobufConfiguratorExts.kt
@@ -2,6 +2,7 @@ package com.google.protobuf.gradle
 
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
+import org.gradle.api.file.SourceDirectorySet
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.api.tasks.SourceSet
 import org.gradle.kotlin.dsl.NamedDomainObjectContainerScope
@@ -45,16 +46,17 @@ fun Project.protobuf(action: ProtobufConfigurator.()->Unit) {
  * }
  * ```
  *
- * @receiver [SourceSet] The source set for which the [ProtobufSourceDirectorySet] extension
+ * @receiver [SourceSet] The source set for which the "proto" [SourceDirectorySet] extension
  * will be configured
  *
- * @param action A configuration lambda to apply on a receiver of type [ProtobufSourceDirectorySet]
+ * @param action A configuration lambda to apply on a receiver of type [SourceDirectorySet]
  * @return [Unit]
  */
-fun SourceSet.proto(action: ProtobufSourceDirectorySet.() -> Unit) {
+fun SourceSet.proto(action: SourceDirectorySet.() -> Unit) {
     (this as? ExtensionAware)
         ?.extensions
-        ?.getByType(ProtobufSourceDirectorySet::class.java)
+        ?.getByName("proto")
+        ?.let { it as?  SourceDirectorySet }
         ?.apply(action)
 }