Skip to content

Commit 726736d

Browse files
committed
fix(gradle-plugin): resources not being handled properly
1 parent 0b0c0a7 commit 726736d

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

gradle-plugin/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ org.gradle.configuration-cache=true
66
org.gradle.parallel=true
77
org.gradle.vfs.watch=false
88

9-
version=0.2.1
9+
version=0.2.2

gradle-plugin/src/main/kotlin/net/radsteve/axi/gradle/AxiApplicator.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public object AxiApplicator {
6464

6565
exclude("plugin.yml")
6666
// we exclude the default plugin yml's
67-
from(compilation.defaultSourceSet.resources.sourceDirectories.singleFile) {
67+
from(compilation.resources) {
6868
exclude("paper-plugin.yml")
6969
}
7070
// to add our own
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package net.radsteve.axi.gradle
2+
3+
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
4+
import java.io.File
5+
6+
public val KotlinCompilation<*>.resources: File get() = defaultSourceSet.resources.sourceDirectories.files.first()

gradle-plugin/src/main/kotlin/net/radsteve/axi/gradle/task/ProcessPluginYaml.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.radsteve.axi.gradle.task
22

3+
import net.radsteve.axi.gradle.resources
34
import org.gradle.api.DefaultTask
45
import org.gradle.api.tasks.TaskAction
56
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
@@ -18,7 +19,7 @@ public abstract class ProcessPluginYaml @Inject constructor(
1819
@TaskAction
1920
public fun run() {
2021
val yaml = Yaml()
21-
val resources = compilation.defaultSourceSet.resources.sourceDirectories.singleFile
22+
val resources = compilation.resources
2223

2324
val pluginYamlFile = resources.resolve("plugin.yml")
2425
val paperPluginYamlFile = resources.resolve("paper-plugin.yml")

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
77
org.gradle.parallel=true
88
org.gradle.vfs.watch=false
99

10-
version=0.2.1
10+
version=0.2.2

0 commit comments

Comments
 (0)