Skip to content

Commit d17f9e6

Browse files
committed
Fix compilation of KMP
1 parent c91123f commit d17f9e6

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group = "dev.arbjerg"
8-
version = "1.0.12"
8+
version = "1.0.13"
99

1010
repositories {
1111
mavenCentral()

src/main/kotlin/LavalinkGradlePlugin.kt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import org.gradle.api.tasks.Copy
1313
import org.gradle.api.tasks.SourceSetContainer
1414
import org.gradle.jvm.tasks.Jar
1515
import org.gradle.kotlin.dsl.*
16+
import kotlin.io.path.div
1617

1718
private const val lavalinkExtensionName = "lavalinkPlugin"
1819

@@ -117,12 +118,18 @@ private fun Project.configureTasks(serverDependency: Provider<Dependency>) {
117118
.allDependencies
118119
.filterIsInstance<ProjectDependency>()
119120
.forEach {
120-
val classes = it.dependencyProject.tasks.named("classes")
121-
.map { classes ->
122-
classes.taskDependencies.getDependencies(classes)
121+
val project = it.dependencyProject
122+
if (project.plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")) {
123+
dependsOn(project.tasks.named("jvmMainClasses"))
124+
from(project.buildDir.toPath() / "classes" / "kotlin" / "jvm" / "main") {
125+
include("**/*.class")
123126
}
124-
125-
from(classes)
127+
} else {
128+
dependsOn(project.tasks.named("classes"))
129+
from(project.buildDir.toPath() / "classes" / "java" / "main") {
130+
include("**/*.class")
131+
}
132+
}
126133
}
127134
}
128135

0 commit comments

Comments
 (0)