Skip to content
This repository was archived by the owner on Dec 7, 2024. It is now read-only.

Commit 3e1b6a3

Browse files
committed
fix configuration cache for paper plugin
1 parent b79c47a commit 3e1b6a3

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/main/kotlin/net/minecrell/pluginyml/GeneratePluginDescription.kt

+7-8
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,12 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator
3535
import com.fasterxml.jackson.module.kotlin.registerKotlinModule
3636
import org.gradle.api.DefaultTask
3737
import org.gradle.api.NamedDomainObjectCollection
38-
import org.gradle.api.artifacts.repositories.MavenArtifactRepository
3938
import org.gradle.api.artifacts.repositories.UrlArtifactRepository
4039
import org.gradle.api.artifacts.result.ResolvedComponentResult
4140
import org.gradle.api.file.DirectoryProperty
41+
import org.gradle.api.provider.ListProperty
4242
import org.gradle.api.provider.Property
43-
import org.gradle.api.tasks.Input
44-
import org.gradle.api.tasks.Nested
45-
import org.gradle.api.tasks.Optional
46-
import org.gradle.api.tasks.OutputDirectory
47-
import org.gradle.api.tasks.TaskAction
43+
import org.gradle.api.tasks.*
4844

4945
abstract class GeneratePluginDescription : DefaultTask() {
5046

@@ -54,6 +50,9 @@ abstract class GeneratePluginDescription : DefaultTask() {
5450
@get:Input
5551
abstract val librariesJsonFileName: Property<String>
5652

53+
@get:Input
54+
abstract val repos: ListProperty<String>
55+
5756
@get:Input
5857
@get:Optional
5958
abstract val librariesRootComponent: Property<ResolvedComponentResult>
@@ -86,7 +85,7 @@ abstract class GeneratePluginDescription : DefaultTask() {
8685
mapper.writeValue(outputDirectory.file(fileName).get().asFile, pluginDescription)
8786

8887
if (pluginDescription.generateLibrariesJson) {
89-
val repos = this.project.repositories.withType(MavenArtifactRepository::class.java)
88+
val repos = repos.get()
9089
val dependencies = librariesRootComponent.orNull.collectLibraries()
9190
val pluginLibraries = PluginLibraries(repos, dependencies)
9291

@@ -110,7 +109,7 @@ abstract class GeneratePluginDescription : DefaultTask() {
110109
}
111110

112111
data class PluginLibraries(
113-
val repositories: NamedDomainObjectCollection<MavenArtifactRepository>,
112+
val repositories: List<String>,
114113
val dependencies: List<String>
115114
)
116115

src/main/kotlin/net/minecrell/pluginyml/PlatformPlugin.kt

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ package net.minecrell.pluginyml
2626

2727
import org.gradle.api.Plugin
2828
import org.gradle.api.Project
29+
import org.gradle.api.artifacts.repositories.MavenArtifactRepository
2930
import org.gradle.api.artifacts.result.ResolvedComponentResult
3031
import org.gradle.api.plugins.JavaPlugin
3132
import org.gradle.api.tasks.SourceSet
@@ -59,6 +60,7 @@ abstract class PlatformPlugin<T : PluginDescription>(private val platformName: S
5960
fileName.set(this@PlatformPlugin.fileName)
6061
librariesJsonFileName.set("$prefix-libraries.json")
6162
librariesRootComponent.set(libraries.incoming.resolutionResult.root)
63+
repos.set(project.repositories.withType(MavenArtifactRepository::class.java).map { it.url.toString() })
6264
outputDirectory.set(generatedResourcesDirectory)
6365
pluginDescription.set(provider {
6466
setDefaults(project, description)

0 commit comments

Comments
 (0)