diff --git a/build.gradle.kts b/build.gradle.kts index fc1da85..59f2b7a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "dev.arbjerg" -version = "1.0.13" +version = "1.0.14" repositories { mavenCentral() diff --git a/src/main/kotlin/LavalinkGradlePlugin.kt b/src/main/kotlin/LavalinkGradlePlugin.kt index f6e33c9..e2a6249 100644 --- a/src/main/kotlin/LavalinkGradlePlugin.kt +++ b/src/main/kotlin/LavalinkGradlePlugin.kt @@ -5,6 +5,7 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.artifacts.Dependency import org.gradle.api.artifacts.ProjectDependency +import org.gradle.api.file.RelativePath import org.gradle.api.provider.Provider import org.gradle.api.publish.PublishingExtension import org.gradle.api.publish.maven.MavenPublication @@ -117,8 +118,8 @@ private fun Project.configureTasks(serverDependency: Provider) { configurations.getByName("runtimeClasspath") .allDependencies .filterIsInstance() - .forEach { - val project = it.dependencyProject + .forEach { dependency -> + val project = dependency.dependencyProject if (project.plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")) { dependsOn(project.tasks.named("jvmMainClasses")) from(project.buildDir.toPath() / "classes" / "kotlin" / "jvm" / "main") { @@ -126,8 +127,11 @@ private fun Project.configureTasks(serverDependency: Provider) { } } else { dependsOn(project.tasks.named("classes")) - from(project.buildDir.toPath() / "classes" / "java" / "main") { - include("**/*.class") + from(project.buildDir.toPath() / "classes") { + include("**/main/**/*.class") + eachFile { + path = path.substringAfter("main/") + } } } }