Exposing GradleAPITarget classpaths as Dependency (#62)

Author: gmazzo

plugin/api/plugin.api

@@ -1,8 +1,8 @@
 public abstract interface class io/github/gmazzo/gradle/multiapi/GradleAPITarget : org/gradle/api/Named {
 	public abstract fun getFeatureName ()Ljava/lang/String;
-	public abstract fun getGradleApi ()Lorg/gradle/api/file/FileCollection;
-	public abstract fun getGradleKotlinDsl ()Lorg/gradle/api/file/FileCollection;
-	public abstract fun getGradleTestKit ()Lorg/gradle/api/file/FileCollection;
+	public abstract fun getGradleApi ()Lorg/gradle/api/artifacts/Dependency;
+	public abstract fun getGradleKotlinDsl ()Lorg/gradle/api/artifacts/Dependency;
+	public abstract fun getGradleTestKit ()Lorg/gradle/api/artifacts/Dependency;
 	public abstract fun getGradleVersion ()Lorg/gradle/util/GradleVersion;
 	public abstract fun getSourceSet ()Lorg/gradle/api/tasks/SourceSet;
 	public abstract fun getTestSuite ()Lorg/gradle/api/plugins/jvm/JvmTestSuite;

plugin/src/main/kotlin/io/github/gmazzo/gradle/multiapi/GradleAPIClasspathProvider.kt

@@ -6,6 +6,8 @@ import java.io.File
 import javax.inject.Inject
 import org.gradle.api.Named
 import org.gradle.api.Project
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.artifacts.dsl.Dependencies
 import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.file.FileCollectionFactory
 import org.gradle.api.internal.file.collections.MinimalFileSet
@@ -36,6 +38,8 @@ internal abstract class GradleAPIClasspathProvider @Inject constructor(
 
     private val logger = project.logger
 
+    private val dependencies = project.dependencies
+
     private val forceRebuild = gradle.startParameter.isRerunTasks
 
     private val workDirs by lazy { extractAPIs() }
@@ -47,13 +51,13 @@ internal abstract class GradleAPIClasspathProvider @Inject constructor(
         GradleVersion.version(name)
 
     override val gradleApi =
-        createCollection("Gradle ${gradleVersion.version} API files") { workDirs.first }
+        createDependency("Gradle ${gradleVersion.version} API files") { workDirs.first }
 
     override val gradleTestKit =
-        createCollection("Gradle ${gradleVersion.version} TestKit files") { workDirs.second }
+        createDependency("Gradle ${gradleVersion.version} TestKit files") { workDirs.second }
 
     override val gradleKotlinDsl =
-        createCollection("Gradle ${gradleVersion.version} Kotlin DSL files") { workDirs.third }
+        createDependency("Gradle ${gradleVersion.version} Kotlin DSL files") { workDirs.third }
 
     override val sourceSet: SourceSet =
         sourceSets.maybeCreate(featureName)
@@ -108,8 +112,8 @@ internal abstract class GradleAPIClasspathProvider @Inject constructor(
         return result
     }
 
-    private fun createCollection(displayName: String, classpathFile: () -> File): FileCollection =
-        fileCollectionFactory.create(GradleClasspath(displayName, classpathFile))
+    private fun createDependency(displayName: String, classpathFile: () -> File): Dependency =
+        dependencies.create(fileCollectionFactory.create(GradleClasspath(displayName, classpathFile)))
 
     private val File.isValidClasspath
         get() = isFile && useLines { lines -> lines.all { File(it).isFile } }

plugin/src/main/kotlin/io/github/gmazzo/gradle/multiapi/GradleAPITarget.kt

@@ -3,6 +3,7 @@
 package io.github.gmazzo.gradle.multiapi
 
 import org.gradle.api.Named
+import org.gradle.api.artifacts.Dependency
 import org.gradle.api.file.FileCollection
 import org.gradle.api.plugins.jvm.JvmTestSuite
 import org.gradle.api.tasks.SourceSet
@@ -14,11 +15,11 @@ public interface GradleAPITarget : Named {
 
     public val gradleVersion: GradleVersion
 
-    public val gradleApi: FileCollection
+    public val gradleApi: Dependency
 
-    public val gradleTestKit: FileCollection
+    public val gradleTestKit: Dependency
 
-    public val gradleKotlinDsl: FileCollection
+    public val gradleKotlinDsl: Dependency
 
     public val sourceSet: SourceSet