Fix compilation of Kotlin Jvm projects

lavalink-devs · Aug 12, 2023 · b8ab639 · b8ab639
1 parent d17f9e6
commit b8ab639
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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,17 +118,20 @@ private fun Project.configureTasks(serverDependency: Provider<Dependency>) {
             configurations.getByName("runtimeClasspath")
                 .allDependencies
                 .filterIsInstance<ProjectDependency>()
-                .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") {
                             include("**/*.class")
                         }
                     } 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/")
+                            }
                         }
                     }
                 }